From 031b9d7d864161a595a8f1476abc12afaca9ada4 Mon Sep 17 00:00:00 2001
From: Tor Lillqvist <tml@iki.fi>
Date: Thu, 8 Nov 2012 17:15:07 +0200
Subject: Use JNIEXPORT to really export these for Android

Now with DISABLE_DYNLOADING, SAL_DLLPUBLIC_EXPORT actually means
hidden visibilty. Which is OK in general as with a single DSO (or a
single executable, for iOS), none of our "normal" entry points need to
be visible froom the outside.

So for the JNI entry points use JNIEXPORT. On "normal" platforms it
should be equivalent to SAL_DLLPUBLIC_EXPORT.

Change-Id: Iad634950e635ac03a0e90cae6d00afd9fb4eeb64
---
 bridges/source/jni_uno/jni_info.cxx         |  2 +-
 bridges/source/jni_uno/jni_java2uno.cxx     |  4 ++--
 bridges/source/jni_uno/nativethreadpool.cxx | 16 ++++++++--------
 3 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'bridges')

diff --git a/bridges/source/jni_uno/jni_info.cxx b/bridges/source/jni_uno/jni_info.cxx
index 8274f20858c7..1e0378db0850 100644
--- a/bridges/source/jni_uno/jni_info.cxx
+++ b/bridges/source/jni_uno/jni_info.cxx
@@ -985,7 +985,7 @@ extern "C"
 {
 
 //------------------------------------------------------------------------------
-SAL_DLLPUBLIC_EXPORT void
+JNIEXPORT void
 JNICALL Java_com_sun_star_bridges_jni_1uno_JNI_1info_1holder_finalize__J(
     JNIEnv * jni_env, SAL_UNUSED_PARAMETER jobject, jlong jni_info_handle )
     SAL_THROW_EXTERN_C()
diff --git a/bridges/source/jni_uno/jni_java2uno.cxx b/bridges/source/jni_uno/jni_java2uno.cxx
index a07a4f4f18e6..26b757fa29e5 100644
--- a/bridges/source/jni_uno/jni_java2uno.cxx
+++ b/bridges/source/jni_uno/jni_java2uno.cxx
@@ -388,7 +388,7 @@ extern "C"
 {
 
 //------------------------------------------------------------------------------
-SAL_DLLPUBLIC_EXPORT jobject
+JNIEXPORT jobject
 JNICALL Java_com_sun_star_bridges_jni_1uno_JNI_1proxy_dispatch_1call(
     JNIEnv * jni_env, jobject jo_proxy, jlong bridge_handle, jstring jo_method,
     jobjectArray jo_args /* may be 0 */ )
@@ -654,7 +654,7 @@ JNICALL Java_com_sun_star_bridges_jni_1uno_JNI_1proxy_dispatch_1call(
 }
 
 //------------------------------------------------------------------------------
-SAL_DLLPUBLIC_EXPORT void
+JNIEXPORT void
 JNICALL Java_com_sun_star_bridges_jni_1uno_JNI_1proxy_finalize__J(
     JNIEnv * jni_env, jobject jo_proxy, jlong bridge_handle )
     SAL_THROW_EXTERN_C()
diff --git a/bridges/source/jni_uno/nativethreadpool.cxx b/bridges/source/jni_uno/nativethreadpool.cxx
index 969d91bb4e80..4891ac347f64 100644
--- a/bridges/source/jni_uno/nativethreadpool.cxx
+++ b/bridges/source/jni_uno/nativethreadpool.cxx
@@ -92,7 +92,7 @@ static void SAL_CALL executeRequest(void * data) {
 
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT jbyteArray JNICALL
+extern "C" JNIEXPORT jbyteArray JNICALL
 Java_com_sun_star_lib_uno_environments_remote_NativeThreadPool_threadId(
     JNIEnv * env, SAL_UNUSED_PARAMETER jclass) SAL_THROW_EXTERN_C()
 {
@@ -117,7 +117,7 @@ Java_com_sun_star_lib_uno_environments_remote_NativeThreadPool_threadId(
     return a;
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT jlong JNICALL
+extern "C" JNIEXPORT jlong JNICALL
 Java_com_sun_star_lib_uno_environments_remote_NativeThreadPool_create(
     JNIEnv * env, SAL_UNUSED_PARAMETER jclass) SAL_THROW_EXTERN_C()
 {
@@ -147,7 +147,7 @@ Java_com_sun_star_lib_uno_environments_remote_NativeThreadPool_create(
     }
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT void JNICALL
+extern "C" JNIEXPORT void JNICALL
 Java_com_sun_star_lib_uno_environments_remote_NativeThreadPool_attach(
     SAL_UNUSED_PARAMETER JNIEnv *, SAL_UNUSED_PARAMETER jclass, jlong pool)
     SAL_THROW_EXTERN_C()
@@ -155,7 +155,7 @@ Java_com_sun_star_lib_uno_environments_remote_NativeThreadPool_attach(
     uno_threadpool_attach(reinterpret_cast< Pool * >(pool)->pool);
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT jobject JNICALL
+extern "C" JNIEXPORT jobject JNICALL
 Java_com_sun_star_lib_uno_environments_remote_NativeThreadPool_enter(
     JNIEnv * env, SAL_UNUSED_PARAMETER jclass, jlong pool) SAL_THROW_EXTERN_C()
 {
@@ -171,7 +171,7 @@ Java_com_sun_star_lib_uno_environments_remote_NativeThreadPool_enter(
     return ref;
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT void JNICALL
+extern "C" JNIEXPORT void JNICALL
 Java_com_sun_star_lib_uno_environments_remote_NativeThreadPool_detach(
     SAL_UNUSED_PARAMETER JNIEnv *, SAL_UNUSED_PARAMETER jclass, jlong pool)
     SAL_THROW_EXTERN_C()
@@ -179,7 +179,7 @@ Java_com_sun_star_lib_uno_environments_remote_NativeThreadPool_detach(
     uno_threadpool_detach(reinterpret_cast< Pool * >(pool)->pool);
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT void JNICALL
+extern "C" JNIEXPORT void JNICALL
 Java_com_sun_star_lib_uno_environments_remote_NativeThreadPool_putJob(
     JNIEnv * env, SAL_UNUSED_PARAMETER jclass, jlong pool, jbyteArray threadId,
     jobject job, jboolean request, jboolean oneWay) SAL_THROW_EXTERN_C()
@@ -214,7 +214,7 @@ Java_com_sun_star_lib_uno_environments_remote_NativeThreadPool_putJob(
         request ? executeRequest : 0, oneWay);
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT void JNICALL
+extern "C" JNIEXPORT void JNICALL
 Java_com_sun_star_lib_uno_environments_remote_NativeThreadPool_dispose(
     SAL_UNUSED_PARAMETER JNIEnv *, SAL_UNUSED_PARAMETER jclass, jlong pool)
     SAL_THROW_EXTERN_C()
@@ -222,7 +222,7 @@ Java_com_sun_star_lib_uno_environments_remote_NativeThreadPool_dispose(
     uno_threadpool_dispose(reinterpret_cast< Pool * >(pool)->pool);
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT void JNICALL
+extern "C" JNIEXPORT void JNICALL
 Java_com_sun_star_lib_uno_environments_remote_NativeThreadPool_destroy(
     SAL_UNUSED_PARAMETER JNIEnv *, SAL_UNUSED_PARAMETER jclass, jlong pool)
     SAL_THROW_EXTERN_C()
-- 
cgit