Kaydet (Commit) 84caa11f authored tarafından Stephan Bergmann's avatar Stephan Bergmann

Replace JNIEXPORT -> SAL_JNI_EXPORT

cf. 9a745cbf "Introdude SAL_JNI_EXPORT and use
that instead of JNIEXPORT"

Change-Id: I81dcc8dfcb878d3e935d807f491b99927637c23c
üst 8e94c40f
...@@ -51,7 +51,7 @@ Any Transport::mapAny( Any const & any ) ...@@ -51,7 +51,7 @@ Any Transport::mapAny( Any const & any )
} }
} }
extern "C" JNIEXPORT jobject JNICALL Java_test_java_1uno_anytest_TestJni_create_1jni_1transport( extern "C" SAL_JNI_EXPORT jobject JNICALL Java_test_java_1uno_anytest_TestJni_create_1jni_1transport(
JNIEnv * jni_env, jclass, jobject loader ) JNIEnv * jni_env, jclass, jobject loader )
SAL_THROW_EXTERN_C() SAL_THROW_EXTERN_C()
{ {
......
...@@ -23,6 +23,11 @@ ...@@ -23,6 +23,11 @@
#ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_HSQLDB_HSTORAGEACCESS_H #ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_HSQLDB_HSTORAGEACCESS_H
#define INCLUDED_CONNECTIVITY_SOURCE_INC_HSQLDB_HSTORAGEACCESS_H #define INCLUDED_CONNECTIVITY_SOURCE_INC_HSQLDB_HSTORAGEACCESS_H
#include <sal/config.h>
#include <sal/types.h>
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
...@@ -32,7 +37,7 @@ extern "C" { ...@@ -32,7 +37,7 @@ extern "C" {
* Method: openStream * Method: openStream
* Signature: (Ljava/lang/String;Ljava/lang/String;I)V * Signature: (Ljava/lang/String;Ljava/lang/String;I)V
*/ */
JNIEXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_openStream SAL_JNI_EXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_openStream
(JNIEnv *, jobject, jstring, jstring, jint); (JNIEnv *, jobject, jstring, jstring, jint);
/* /*
...@@ -40,7 +45,7 @@ JNIEXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_o ...@@ -40,7 +45,7 @@ JNIEXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_o
* Method: close * Method: close
* Signature: (Ljava/lang/String;Ljava/lang/String;)V * Signature: (Ljava/lang/String;Ljava/lang/String;)V
*/ */
JNIEXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_close SAL_JNI_EXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_close
(JNIEnv *, jobject, jstring, jstring); (JNIEnv *, jobject, jstring, jstring);
/* /*
...@@ -48,7 +53,7 @@ JNIEXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_c ...@@ -48,7 +53,7 @@ JNIEXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_c
* Method: getFilePointer * Method: getFilePointer
* Signature: (Ljava/lang/String;Ljava/lang/String;)J * Signature: (Ljava/lang/String;Ljava/lang/String;)J
*/ */
JNIEXPORT jlong JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_getFilePointer SAL_JNI_EXPORT jlong JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_getFilePointer
(JNIEnv *, jobject, jstring, jstring); (JNIEnv *, jobject, jstring, jstring);
/* /*
...@@ -56,7 +61,7 @@ JNIEXPORT jlong JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_ ...@@ -56,7 +61,7 @@ JNIEXPORT jlong JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_
* Method: length * Method: length
* Signature: (Ljava/lang/String;Ljava/lang/String;)J * Signature: (Ljava/lang/String;Ljava/lang/String;)J
*/ */
JNIEXPORT jlong JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_length SAL_JNI_EXPORT jlong JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_length
(JNIEnv *, jobject, jstring, jstring); (JNIEnv *, jobject, jstring, jstring);
/* /*
...@@ -64,7 +69,7 @@ JNIEXPORT jlong JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_ ...@@ -64,7 +69,7 @@ JNIEXPORT jlong JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_
* Method: read * Method: read
* Signature: (Ljava/lang/String;Ljava/lang/String;)I * Signature: (Ljava/lang/String;Ljava/lang/String;)I
*/ */
JNIEXPORT jint JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_read__Ljava_lang_String_2Ljava_lang_String_2 SAL_JNI_EXPORT jint JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_read__Ljava_lang_String_2Ljava_lang_String_2
(JNIEnv *, jobject, jstring, jstring); (JNIEnv *, jobject, jstring, jstring);
/* /*
...@@ -72,7 +77,7 @@ JNIEXPORT jint JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_r ...@@ -72,7 +77,7 @@ JNIEXPORT jint JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_r
* Method: read * Method: read
* Signature: (Ljava/lang/String;Ljava/lang/String;[BII)I * Signature: (Ljava/lang/String;Ljava/lang/String;[BII)I
*/ */
JNIEXPORT jint JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_read__Ljava_lang_String_2Ljava_lang_String_2_3BII SAL_JNI_EXPORT jint JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_read__Ljava_lang_String_2Ljava_lang_String_2_3BII
(JNIEnv *, jobject, jstring, jstring, jbyteArray, jint, jint); (JNIEnv *, jobject, jstring, jstring, jbyteArray, jint, jint);
/* /*
...@@ -80,7 +85,7 @@ JNIEXPORT jint JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_r ...@@ -80,7 +85,7 @@ JNIEXPORT jint JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_r
* Method: readInt * Method: readInt
* Signature: (Ljava/lang/String;Ljava/lang/String;)I * Signature: (Ljava/lang/String;Ljava/lang/String;)I
*/ */
JNIEXPORT jint JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_readInt SAL_JNI_EXPORT jint JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_readInt
(JNIEnv *, jobject, jstring, jstring); (JNIEnv *, jobject, jstring, jstring);
/* /*
...@@ -88,7 +93,7 @@ JNIEXPORT jint JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_r ...@@ -88,7 +93,7 @@ JNIEXPORT jint JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_r
* Method: seek * Method: seek
* Signature: (Ljava/lang/String;Ljava/lang/String;J)V * Signature: (Ljava/lang/String;Ljava/lang/String;J)V
*/ */
JNIEXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_seek SAL_JNI_EXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_seek
(JNIEnv *, jobject, jstring, jstring, jlong); (JNIEnv *, jobject, jstring, jstring, jlong);
/* /*
...@@ -96,7 +101,7 @@ JNIEXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_s ...@@ -96,7 +101,7 @@ JNIEXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_s
* Method: write * Method: write
* Signature: (Ljava/lang/String;Ljava/lang/String;[BII)V * Signature: (Ljava/lang/String;Ljava/lang/String;[BII)V
*/ */
JNIEXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_write SAL_JNI_EXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_write
(JNIEnv *, jobject, jstring, jstring, jbyteArray, jint, jint); (JNIEnv *, jobject, jstring, jstring, jbyteArray, jint, jint);
/* /*
...@@ -104,7 +109,7 @@ JNIEXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_w ...@@ -104,7 +109,7 @@ JNIEXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_w
* Method: writeInt * Method: writeInt
* Signature: (Ljava/lang/String;Ljava/lang/String;I)V * Signature: (Ljava/lang/String;Ljava/lang/String;I)V
*/ */
JNIEXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_writeInt SAL_JNI_EXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_writeInt
(JNIEnv *, jobject, jstring, jstring, jint); (JNIEnv *, jobject, jstring, jstring, jint);
......
...@@ -23,6 +23,11 @@ ...@@ -23,6 +23,11 @@
#ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_HSQLDB_STORAGEFILEACCESS_H #ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_HSQLDB_STORAGEFILEACCESS_H
#define INCLUDED_CONNECTIVITY_SOURCE_INC_HSQLDB_STORAGEFILEACCESS_H #define INCLUDED_CONNECTIVITY_SOURCE_INC_HSQLDB_STORAGEFILEACCESS_H
#include <sal/config.h>
#include <sal/types.h>
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
...@@ -31,7 +36,7 @@ extern "C" { ...@@ -31,7 +36,7 @@ extern "C" {
* Method: isStreamElement * Method: isStreamElement
* Signature: (Ljava/lang/String;Ljava/lang/String;)Z * Signature: (Ljava/lang/String;Ljava/lang/String;)Z
*/ */
JNIEXPORT jboolean JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageFileAccess_isStreamElement SAL_JNI_EXPORT jboolean JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageFileAccess_isStreamElement
(JNIEnv *, jobject, jstring, jstring); (JNIEnv *, jobject, jstring, jstring);
/* /*
...@@ -39,7 +44,7 @@ JNIEXPORT jboolean JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageFileAccess ...@@ -39,7 +44,7 @@ JNIEXPORT jboolean JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageFileAccess
* Method: removeElement * Method: removeElement
* Signature: (Ljava/lang/String;Ljava/lang/String;)V * Signature: (Ljava/lang/String;Ljava/lang/String;)V
*/ */
JNIEXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageFileAccess_removeElement SAL_JNI_EXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageFileAccess_removeElement
(JNIEnv *, jobject, jstring, jstring); (JNIEnv *, jobject, jstring, jstring);
/* /*
...@@ -47,7 +52,7 @@ JNIEXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageFileAccess_rem ...@@ -47,7 +52,7 @@ JNIEXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageFileAccess_rem
* Method: renameElement * Method: renameElement
* Signature: (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V * Signature: (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
*/ */
JNIEXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageFileAccess_renameElement SAL_JNI_EXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageFileAccess_renameElement
(JNIEnv *, jobject, jstring, jstring, jstring); (JNIEnv *, jobject, jstring, jstring, jstring);
#ifdef __cplusplus #ifdef __cplusplus
......
...@@ -23,6 +23,11 @@ ...@@ -23,6 +23,11 @@
#ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_HSQLDB_STORAGENATIVEINPUTSTREAM_H #ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_HSQLDB_STORAGENATIVEINPUTSTREAM_H
#define INCLUDED_CONNECTIVITY_SOURCE_INC_HSQLDB_STORAGENATIVEINPUTSTREAM_H #define INCLUDED_CONNECTIVITY_SOURCE_INC_HSQLDB_STORAGENATIVEINPUTSTREAM_H
#include <sal/config.h>
#include <sal/types.h>
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
...@@ -32,7 +37,7 @@ extern "C" { ...@@ -32,7 +37,7 @@ extern "C" {
* Method: openStream * Method: openStream
* Signature: (Ljava/lang/String;Ljava/lang/String;I)V * Signature: (Ljava/lang/String;Ljava/lang/String;I)V
*/ */
JNIEXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputStream_openStream SAL_JNI_EXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputStream_openStream
(JNIEnv * env, jobject obj_this,jstring key, jstring name, jint); (JNIEnv * env, jobject obj_this,jstring key, jstring name, jint);
/* /*
...@@ -40,7 +45,7 @@ JNIEXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputStr ...@@ -40,7 +45,7 @@ JNIEXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputStr
* Method: read * Method: read
* Signature: (Ljava/lang/String;Ljava/lang/String;)I * Signature: (Ljava/lang/String;Ljava/lang/String;)I
*/ */
JNIEXPORT jint JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputStream_read__Ljava_lang_String_2Ljava_lang_String_2 SAL_JNI_EXPORT jint JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputStream_read__Ljava_lang_String_2Ljava_lang_String_2
(JNIEnv * env, jobject obj_this,jstring key, jstring name); (JNIEnv * env, jobject obj_this,jstring key, jstring name);
/* /*
...@@ -48,7 +53,7 @@ JNIEXPORT jint JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputStr ...@@ -48,7 +53,7 @@ JNIEXPORT jint JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputStr
* Method: read * Method: read
* Signature: (Ljava/lang/String;Ljava/lang/String;[BII)I * Signature: (Ljava/lang/String;Ljava/lang/String;[BII)I
*/ */
JNIEXPORT jint JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputStream_read__Ljava_lang_String_2Ljava_lang_String_2_3BII SAL_JNI_EXPORT jint JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputStream_read__Ljava_lang_String_2Ljava_lang_String_2_3BII
(JNIEnv * env, jobject obj_this,jstring key, jstring name, jbyteArray, jint, jint); (JNIEnv * env, jobject obj_this,jstring key, jstring name, jbyteArray, jint, jint);
/* /*
...@@ -56,7 +61,7 @@ JNIEXPORT jint JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputStr ...@@ -56,7 +61,7 @@ JNIEXPORT jint JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputStr
* Method: close * Method: close
* Signature: (Ljava/lang/String;Ljava/lang/String;)V * Signature: (Ljava/lang/String;Ljava/lang/String;)V
*/ */
JNIEXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputStream_close SAL_JNI_EXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputStream_close
(JNIEnv *, jobject, jstring, jstring); (JNIEnv *, jobject, jstring, jstring);
/* /*
...@@ -64,7 +69,7 @@ JNIEXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputStr ...@@ -64,7 +69,7 @@ JNIEXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputStr
* Method: skip * Method: skip
* Signature: (Ljava/lang/String;Ljava/lang/String;J)J * Signature: (Ljava/lang/String;Ljava/lang/String;J)J
*/ */
JNIEXPORT jlong JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputStream_skip SAL_JNI_EXPORT jlong JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputStream_skip
(JNIEnv *, jobject, jstring, jstring, jlong); (JNIEnv *, jobject, jstring, jstring, jlong);
/* /*
...@@ -72,7 +77,7 @@ JNIEXPORT jlong JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputSt ...@@ -72,7 +77,7 @@ JNIEXPORT jlong JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputSt
* Method: available * Method: available
* Signature: (Ljava/lang/String;Ljava/lang/String;)I * Signature: (Ljava/lang/String;Ljava/lang/String;)I
*/ */
JNIEXPORT jint JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputStream_available SAL_JNI_EXPORT jint JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputStream_available
(JNIEnv *, jobject, jstring, jstring); (JNIEnv *, jobject, jstring, jstring);
/* /*
...@@ -80,7 +85,7 @@ JNIEXPORT jint JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputStr ...@@ -80,7 +85,7 @@ JNIEXPORT jint JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputStr
* Method: read * Method: read
* Signature: (Ljava/lang/String;Ljava/lang/String;[B)I * Signature: (Ljava/lang/String;Ljava/lang/String;[B)I
*/ */
JNIEXPORT jint JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputStream_read__Ljava_lang_String_2Ljava_lang_String_2_3B SAL_JNI_EXPORT jint JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputStream_read__Ljava_lang_String_2Ljava_lang_String_2_3B
(JNIEnv *, jobject, jstring, jstring, jbyteArray); (JNIEnv *, jobject, jstring, jstring, jbyteArray);
#ifdef __cplusplus #ifdef __cplusplus
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment