2 files changed, 3 insertions, 18 deletions
diff --git a/dalvik/src/main/native/dalvik_system_TouchDex.cpp b/dalvik/src/main/native/dalvik_system_TouchDex.cpp
index e8b834b..b2614c9 100644
--- a/dalvik/src/main/native/dalvik_system_TouchDex.cpp
+++ b/dalvik/src/main/native/dalvik_system_TouchDex.cpp
@@ -259,20 +259,12 @@ static void logProcStatus(pid_t pid)
     fclose(fp);
 }
 
-/*
- * JNI registration.
- */
 static JNINativeMethod gMethods[] = {
-    /* name, signature, funcPtr */
     { "trampoline", "(Ljava/lang/String;Ljava/lang/String;)I",
         (void*) dalvik_system_TouchDex_trampoline },
 };
-
-extern "C" int register_dalvik_system_TouchDex(JNIEnv* env)
-{
-    return jniRegisterNativeMethods(env, JAVA_PACKAGE "/TouchDex",
-        gMethods, NELEM(gMethods));
+int register_dalvik_system_TouchDex(JNIEnv* env) {
+    return jniRegisterNativeMethods(env, JAVA_PACKAGE "/TouchDex", gMethods, NELEM(gMethods));
 }
 
 }; // namespace android
-
diff --git a/dalvik/src/main/native/org_apache_harmony_dalvik_NativeTestTarget.c b/dalvik/src/main/native/org_apache_harmony_dalvik_NativeTestTarget.c
index 25235dc..9aa0a8e 100644
--- a/dalvik/src/main/native/org_apache_harmony_dalvik_NativeTestTarget.c
+++ b/dalvik/src/main/native/org_apache_harmony_dalvik_NativeTestTarget.c
@@ -50,11 +50,7 @@ static void emptyJniStaticMethod6L(JNIEnv* env, jclass clazz,
     // This space intentionally left blank.
 }
 
-/*
- * JNI registration
- */
 static JNINativeMethod gMethods[] = {
-    /* name, signature, funcPtr */
     { "emptyJniStaticMethod0",  "()V",  emptyJniStaticMethod0 },
     { "emptyJniStaticMethod6",  "(IIIIII)V", emptyJniStaticMethod6 },
     { "emptyJniStaticMethod6L",
@@ -62,9 +58,7 @@ static JNINativeMethod gMethods[] = {
       "Ljava/lang/Object;[Ljava/lang/Object;[[[[Ljava/lang/Object;)V",
       emptyJniStaticMethod6L },
 };
-
-int register_org_apache_harmony_dalvik_NativeTestTarget(JNIEnv* env)
-{
+int register_org_apache_harmony_dalvik_NativeTestTarget(JNIEnv* env) {
     int result = jniRegisterNativeMethods(env,
             "org/apache/harmony/dalvik/NativeTestTarget",
             gMethods, NELEM(gMethods));
@@ -75,4 +69,3 @@ int register_org_apache_harmony_dalvik_NativeTestTarget(JNIEnv* env)
     }
     return 0;
 }
-