From e20dfeaa82366edb46f07c154c9cf23c3fc11ac1 Mon Sep 17 00:00:00 2001
From: Brenton Bostick <bostick@gmail.com>
Date: Mon, 30 Jan 2023 16:19:11 -0500
Subject: [PATCH] move extern "C" only JNI functions need to be exported

---
 java/jni/ZT_jniutils.cpp              | 8 --------
 java/jni/ZT_jniutils.h                | 8 --------
 java/jni/com_zerotierone_sdk_Node.cpp | 8 ++++----
 3 files changed, 4 insertions(+), 20 deletions(-)

diff --git a/java/jni/ZT_jniutils.cpp b/java/jni/ZT_jniutils.cpp
index f58154d16..f3d528183 100644
--- a/java/jni/ZT_jniutils.cpp
+++ b/java/jni/ZT_jniutils.cpp
@@ -30,10 +30,6 @@
 
 extern JniLookup lookup;
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 jobject createResultObject(JNIEnv *env, ZT_ResultCode code)
 {
     jclass resultClass = NULL;
@@ -1028,7 +1024,3 @@ jobject newVirtualNetworkDNS(JNIEnv *env, const ZT_VirtualNetworkDNS &dns)
     }
     return NULL;
 }
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/java/jni/ZT_jniutils.h b/java/jni/ZT_jniutils.h
index 02c2e20f1..a9dc40e48 100644
--- a/java/jni/ZT_jniutils.h
+++ b/java/jni/ZT_jniutils.h
@@ -22,10 +22,6 @@
 #include <jni.h>
 #include <ZeroTierOne.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #define LOG_TAG "ZeroTierOneJNI"
 
 #if defined(__ANDROID__)
@@ -78,8 +74,4 @@ jobject newVirtualNetworkRoute(JNIEnv *env, const ZT_VirtualNetworkRoute &route)
 
 jobject newVirtualNetworkDNS(JNIEnv *env, const ZT_VirtualNetworkDNS &dns);
 
-#ifdef __cplusplus
-}
 #endif
-
-#endif
\ No newline at end of file
diff --git a/java/jni/com_zerotierone_sdk_Node.cpp b/java/jni/com_zerotierone_sdk_Node.cpp
index 877865828..9b5a6fbd6 100644
--- a/java/jni/com_zerotierone_sdk_Node.cpp
+++ b/java/jni/com_zerotierone_sdk_Node.cpp
@@ -40,10 +40,6 @@
 // global static JNI Lookup Object
 JniLookup lookup;
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 namespace {
     struct JniRef
     {
@@ -732,6 +728,10 @@ namespace {
     }
 }
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *reserved)
 {
     lookup.setJavaVM(vm);