diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2012-08-08 18:20:49 +0200 |
---|---|---|
committer | Michael Stahl <mstahl@redhat.com> | 2012-08-09 10:44:33 +0200 |
commit | de536db02e13bfeed716ad6e8b4d9a12c421aca9 (patch) | |
tree | 532f388e3450a08041e5c19f477372d9c9988cc5 /javaunohelper | |
parent | n#774167: Crash fix. (diff) | |
download | core-de536db02e13bfeed716ad6e8b4d9a12c421aca9.tar.gz core-de536db02e13bfeed716ad6e8b4d9a12c421aca9.zip |
Export JNI functions from juh, juhx libs
...this had been broken with gbuild'ification of javaunohelper and caused
java.lang.UnsatisfiedLinkError from
com.sun.star.comp.helper.Bootstrap.cppuhelper_bootstrap, as could be witnessed
by test-javanative in ure/source/uretest/Makefile failing.
(cherry picked from commit e7a02843e54e1b64e2078549af110beaccf50348)
Signed-off-by: Michael Stahl <mstahl@redhat.com>
Conflicts:
javaunohelper/source/javaunohelper.map
Change-Id: I8a76e1195c713895bfb8eae5070b0f73beb2b897
Diffstat (limited to 'javaunohelper')
-rw-r--r-- | javaunohelper/source/bootstrap.cxx | 2 | ||||
-rw-r--r-- | javaunohelper/source/javaunohelper.cxx | 6 | ||||
-rw-r--r-- | javaunohelper/source/javaunohelper.map | 9 | ||||
-rw-r--r-- | javaunohelper/source/preload.cxx | 8 |
4 files changed, 8 insertions, 17 deletions
diff --git a/javaunohelper/source/bootstrap.cxx b/javaunohelper/source/bootstrap.cxx index d053d5793d2f..5b01405d1f53 100644 --- a/javaunohelper/source/bootstrap.cxx +++ b/javaunohelper/source/bootstrap.cxx @@ -75,7 +75,7 @@ inline ::rtl::OUString jstring_to_oustring( jstring jstr, JNIEnv * jni_env ) } //================================================================================================== -extern "C" JNIEXPORT jobject JNICALL Java_com_sun_star_comp_helper_Bootstrap_cppuhelper_1bootstrap( +extern "C" SAL_DLLPUBLIC_EXPORT jobject JNICALL Java_com_sun_star_comp_helper_Bootstrap_cppuhelper_1bootstrap( JNIEnv * jni_env, SAL_UNUSED_PARAMETER jclass, jstring juno_rc, jobjectArray jpairs, jobject loader ) { diff --git a/javaunohelper/source/javaunohelper.cxx b/javaunohelper/source/javaunohelper.cxx index 9016b486ee3e..1ac04d5209a2 100644 --- a/javaunohelper/source/javaunohelper.cxx +++ b/javaunohelper/source/javaunohelper.cxx @@ -61,7 +61,7 @@ using ::rtl::OUString; * Method: component_writeInfo * Signature: (Ljava/lang/String;Lcom/sun/star/lang/XMultiServiceFactory;Lcom/sun/star/registry/XRegistryKey;)Z */ -extern "C" JNIEXPORT jboolean JNICALL +extern "C" SAL_DLLPUBLIC_EXPORT jboolean JNICALL Java_com_sun_star_comp_helper_SharedLibraryLoader_component_1writeInfo( JNIEnv * pJEnv, SAL_UNUSED_PARAMETER jclass, jstring jLibName, jobject jSMgr, jobject jRegKey, jobject loader ) @@ -141,7 +141,7 @@ Java_com_sun_star_comp_helper_SharedLibraryLoader_component_1writeInfo( * Method: component_getFactory * Signature: (Ljava/lang/String;Ljava/lang/String;Lcom/sun/star/lang/XMultiServiceFactory;Lcom/sun/star/registry/XRegistryKey;)Ljava/lang/Object; */ -extern "C" JNIEXPORT jobject JNICALL +extern "C" SAL_DLLPUBLIC_EXPORT jobject JNICALL Java_com_sun_star_comp_helper_SharedLibraryLoader_component_1getFactory( JNIEnv * pJEnv, SAL_UNUSED_PARAMETER jclass, jstring jLibName, jstring jImplName, jobject jSMgr, jobject jRegKey, jobject loader ) @@ -237,7 +237,7 @@ Java_com_sun_star_comp_helper_SharedLibraryLoader_component_1getFactory( * Method: createRegistryServiceFactory * Signature: (Ljava/lang/String;Ljava/lang/String;Z)Ljava/lang/Object; */ -extern "C" JNIEXPORT jobject JNICALL +extern "C" SAL_DLLPUBLIC_EXPORT jobject JNICALL Java_com_sun_star_comp_helper_RegistryServiceFactory_createRegistryServiceFactory( JNIEnv * pJEnv, SAL_UNUSED_PARAMETER jclass, jstring jWriteRegFile, jstring jReadRegFile, jboolean jbReadOnly, jobject loader ) diff --git a/javaunohelper/source/javaunohelper.map b/javaunohelper/source/javaunohelper.map deleted file mode 100644 index dcbe0506ae77..000000000000 --- a/javaunohelper/source/javaunohelper.map +++ /dev/null @@ -1,9 +0,0 @@ -UDK_3_0_0 { - global: - Java_com_sun_star_comp_helper_SharedLibraryLoader_component_1writeInfo; - Java_com_sun_star_comp_helper_SharedLibraryLoader_component_1getFactory; - Java_com_sun_star_comp_helper_RegistryServiceFactory_createRegistryServiceFactory; - Java_com_sun_star_comp_helper_Bootstrap_cppuhelper_1bootstrap; - local: - *; -}; diff --git a/javaunohelper/source/preload.cxx b/javaunohelper/source/preload.cxx index cfaa5aa82ddf..34b669f46e65 100644 --- a/javaunohelper/source/preload.cxx +++ b/javaunohelper/source/preload.cxx @@ -114,7 +114,7 @@ static bool inited_juhx( JNIEnv * jni_env ) } //================================================================================================== -JNIEXPORT jboolean JNICALL +SAL_DLLPUBLIC_EXPORT jboolean JNICALL Java_com_sun_star_comp_helper_SharedLibraryLoader_component_1writeInfo( JNIEnv * pJEnv, jclass jClass, jstring jLibName, jobject jSMgr, jobject jRegKey, jobject loader ) @@ -125,7 +125,7 @@ Java_com_sun_star_comp_helper_SharedLibraryLoader_component_1writeInfo( return JNI_FALSE; } //================================================================================================== -JNIEXPORT jobject JNICALL +SAL_DLLPUBLIC_EXPORT jobject JNICALL Java_com_sun_star_comp_helper_SharedLibraryLoader_component_1getFactory( JNIEnv * pJEnv, jclass jClass, jstring jLibName, jstring jImplName, jobject jSMgr, jobject jRegKey, jobject loader ) @@ -136,7 +136,7 @@ Java_com_sun_star_comp_helper_SharedLibraryLoader_component_1getFactory( return 0; } //================================================================================================== -JNIEXPORT jobject JNICALL +SAL_DLLPUBLIC_EXPORT jobject JNICALL Java_com_sun_star_comp_helper_RegistryServiceFactory_createRegistryServiceFactory( JNIEnv * pJEnv, jclass jClass, jstring jWriteRegFile, jstring jReadRegFile, jboolean jbReadOnly, jobject loader ) @@ -149,7 +149,7 @@ Java_com_sun_star_comp_helper_RegistryServiceFactory_createRegistryServiceFactor return 0; } //================================================================================================== -JNIEXPORT jobject JNICALL +SAL_DLLPUBLIC_EXPORT jobject JNICALL Java_com_sun_star_comp_helper_Bootstrap_cppuhelper_1bootstrap( JNIEnv * jni_env, jclass jClass, jstring juno_rc, jobjectArray jpairs, jobject loader ) |