From 9a745cbf549aa391be2b67f41c83056bd44db97a Mon Sep 17 00:00:00 2001
From: Tor Lillqvist <tml@iki.fi>
Date: Fri, 9 Nov 2012 10:39:35 +0200
Subject: Introdude SAL_JNI_EXPORT and use that instead of JNIEXPORT

Use it in the cases where I yesterday changed SAL_DLLPUBLIC_EXPORT to
JNIEXPORT. It turns out that on Linux JNIEXPORT does not enforce
"default" visibility, but expands to empty.

Change-Id: I033b3cf538715fb596e965e17f3da12fb987df63
---
 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 1e0378db0850..cebc3d4fcd98 100644
--- a/bridges/source/jni_uno/jni_info.cxx
+++ b/bridges/source/jni_uno/jni_info.cxx
@@ -985,7 +985,7 @@ extern "C"
 {
 
 //------------------------------------------------------------------------------
-JNIEXPORT void
+SAL_JNI_EXPORT 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 26b757fa29e5..f82f320a3553 100644
--- a/bridges/source/jni_uno/jni_java2uno.cxx
+++ b/bridges/source/jni_uno/jni_java2uno.cxx
@@ -388,7 +388,7 @@ extern "C"
 {
 
 //------------------------------------------------------------------------------
-JNIEXPORT jobject
+SAL_JNI_EXPORT 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(
 }
 
 //------------------------------------------------------------------------------
-JNIEXPORT void
+SAL_JNI_EXPORT 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 4891ac347f64..633a5473bb21 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" JNIEXPORT jbyteArray JNICALL
+extern "C" SAL_JNI_EXPORT 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" JNIEXPORT jlong JNICALL
+extern "C" SAL_JNI_EXPORT 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" JNIEXPORT void JNICALL
+extern "C" SAL_JNI_EXPORT 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" JNIEXPORT jobject JNICALL
+extern "C" SAL_JNI_EXPORT 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" JNIEXPORT void JNICALL
+extern "C" SAL_JNI_EXPORT 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" JNIEXPORT void JNICALL
+extern "C" SAL_JNI_EXPORT 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" JNIEXPORT void JNICALL
+extern "C" SAL_JNI_EXPORT 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" JNIEXPORT void JNICALL
+extern "C" SAL_JNI_EXPORT 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