[Libreoffice-commits] .: bridges/source

[Libreoffice Gerrit user]

 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(-)

New commits:
commit 78b99d37b58831922be1645ca73e3bb7f50c0e44
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Mon Sep 24 11:14:54 2012 +0200

    JNIEXPORT -> SAL_DLLPUBLIC_EXPORT after gbuildification
    
    (no longer using map file).
    
    Change-Id: Ib19995e11bd5e8bd5c26d29e2bf298e734a06f1f

diff --git a/bridges/source/jni_uno/jni_info.cxx b/bridges/source/jni_uno/jni_info.cxx
index 1e0378d..8274f20 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_DLLPUBLIC_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 26b757f..a07a4f4 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_DLLPUBLIC_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_DLLPUBLIC_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 8ed0d9e..a1e623a 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_DLLPUBLIC_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_DLLPUBLIC_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_DLLPUBLIC_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_DLLPUBLIC_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_DLLPUBLIC_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_DLLPUBLIC_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_DLLPUBLIC_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_DLLPUBLIC_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()