src/jdk.internal.clang/share/native/libjclang/jdk_internal_clang.cpp

@@ -406,17 +406,10 @@
     ctx.visitor = visitor;
     ctx.data = data;
     return clang_visitChildren(*ptr, visitorFunc, &ctx);
 }
 
-JNIEXPORT jboolean JNICALL Java_jdk_internal_clang_Cursor_equalCursor
-  (JNIEnv *env, jobject cursor, jobject other) {
-    CXCursor *ptr = (CXCursor*) J2P(env, cursor);
-    CXCursor *ptrOther = (CXCursor*) J2P(env, other);
-    return clang_equalCursors(*ptr, *ptrOther);
-}
-
 JNIEXPORT jobject JNICALL Java_jdk_internal_clang_Cursor_type
   (JNIEnv *env, jobject cursor) {
     CXCursor *ptr = (CXCursor*) J2P(env, cursor);
     CXType type = clang_getCursorType(*ptr);
     jobject buffer = env->NewDirectByteBuffer(&type, sizeof(CXType));

@@ -515,10 +508,17 @@
     CXCursor *ptr = (CXCursor*) J2P(env, _self);
     CXString mangled = clang_Cursor_getMangling(*ptr);
     return CX2JString(env, mangled);
 }
 
+JNIEXPORT jboolean JNICALL Java_jdk_internal_clang_Cursor_equalCursor
+  (JNIEnv *env, jobject cursor, jobject other) {
+    CXCursor *ptr = (CXCursor*) J2P(env, cursor);
+    CXCursor *ptrOther = (CXCursor*) J2P(env, other);
+    return clang_equalCursors(*ptr, *ptrOther);
+}
+
 /*************************************
  * Type <-> CXType related functions
  *************************************/
 
 JNIEXPORT jboolean JNICALL Java_jdk_internal_clang_Type_isVariadic

@@ -611,10 +611,17 @@
     long long offset = clang_Type_getOffsetOf(*ptr, name);
     env->ReleaseStringUTFChars(field_name, name);
     return offset;
 }
 
+JNIEXPORT jboolean JNICALL Java_jdk_internal_clang_Type_equalType
+  (JNIEnv *env, jobject type, jobject other) {
+    CXType *ptr = (CXType*) J2P(env, type);
+    CXType *ptrOther = (CXType*) J2P(env, other);
+    return clang_equalTypes(*ptr, *ptrOther);
+}
+
 JNIEXPORT jobject JNICALL Java_jdk_internal_clang_Type_getDeclarationCursor
   (JNIEnv *env, jobject type) {
     CXType *ptr = (CXType*) J2P(env, type);
     CXCursor result = clang_getTypeDeclaration(*ptr);
     jobject buffer = env->NewDirectByteBuffer(&result, sizeof(CXCursor));