refactor: cancel macro definition to avoid pollution

Author: sanfengAndroid

library/src/main/cpp/include/proxy_jni.h

@@ -138,6 +138,11 @@ class ProxyJNIEnv {
 
   PROXY_CALL_TYPE(jdouble, Double)
 
+#undef PROXY_CALL_TYPE
+#undef PROXY_CALL_TYPE_METHOD
+#undef PROXY_CALL_TYPE_METHODV
+#undef PROXY_CALL_TYPE_METHODA
+
   void CallVoidMethod(jobject obj, jmethodID methodID, ...) {
     va_list args;
     va_start(args, methodID);
@@ -195,6 +200,11 @@ class ProxyJNIEnv {
 
   PROXY_CALL_NONVIRT_TYPE(jdouble, Double)
 
+#undef PROXY_CALL_NONVIRT_TYPE
+#undef PROXY_CALL_NONVIRT_TYPE_METHOD
+#undef PROXY_CALL_NONVIRT_TYPE_METHODV
+#undef PROXY_CALL_NONVIRT_TYPE_METHODA
+
   void CallNonvirtualVoidMethod(jobject obj, jclass clazz, jmethodID methodID, ...) {
     va_list args;
     va_start(args, methodID);
@@ -297,6 +307,11 @@ class ProxyJNIEnv {
 
   PROXY_CALL_STATIC_TYPE(jdouble, Double)
 
+#undef PROXY_CALL_STATIC_TYPE
+#undef PROXY_CALL_STATIC_TYPE_METHOD
+#undef PROXY_CALL_STATIC_TYPE_METHODV
+#undef PROXY_CALL_STATIC_TYPE_METHODA
+
   void CallStaticVoidMethod(jclass clazz, jmethodID methodID, ...) {
     va_list args;
     va_start(args, methodID);

library/src/main/cpp/linker/linker_main.cpp

@@ -21,7 +21,7 @@ int g_version_code = FAKELINKER_MODULE_VERSION;
 const char *g_version_name = FAKELINKER_MODULE_VERSION_NAME;
 int android_api;
 C_API FakeLinker g_fakelinker_export;
-JNINativeInterface *original_functions = nullptr;
+C_API JNINativeInterface *original_functions = nullptr;
 bool init_success = false;
 JNINativeInterface *fakelinker::ProxyJNIEnv::backup_functions = nullptr;