diff options
| author | Tor Lillqvist <tml@iki.fi> | 2012-11-09 10:39:35 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2012-11-09 10:51:00 +0200 |
| commit | 9a745cbf549aa391be2b67f41c83056bd44db97a (patch) | |
| tree | b8486a4d44051d5f422c8d1cad48b1658265be41 /sal | |
| parent | 0aa1baa80b439740f176249d4f05007f715cf2b0 (diff) | |
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
Diffstat (limited to 'sal')
| -rw-r--r-- | sal/inc/sal/types.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/sal/inc/sal/types.h b/sal/inc/sal/types.h index dff02291d94d..7e215bce09e7 100644 --- a/sal/inc/sal/types.h +++ b/sal/inc/sal/types.h @@ -249,6 +249,7 @@ typedef void * sal_Handle; #if defined(_MSC_VER) || defined(__MINGW32__) # define SAL_DLLPUBLIC_EXPORT __declspec(dllexport) +# define SAL_JNI_EXPORT __declspec(dllexport) #if defined(_MSC_VER) # define SAL_DLLPUBLIC_IMPORT __declspec(dllimport) #else @@ -261,28 +262,33 @@ typedef void * sal_Handle; #elif defined SAL_UNX # if defined(__SUNPRO_CC) && (__SUNPRO_CC >= 0x550) # define SAL_DLLPUBLIC_EXPORT __global +# define SAL_JNI_EXPORT __global # define SAL_DLLPUBLIC_IMPORT # define SAL_DLLPRIVATE __hidden # define SAL_DLLPUBLIC_TEMPLATE # elif defined(__SUNPRO_C ) && (__SUNPRO_C >= 0x550) # define SAL_DLLPUBLIC_EXPORT __global +# define SAL_JNI_EXPORT __global # define SAL_DLLPUBLIC_IMPORT # define SAL_DLLPRIVATE __hidden # define SAL_DLLPUBLIC_TEMPLATE # elif defined(__GNUC__) && defined(HAVE_GCC_VISIBILITY_FEATURE) # if defined(DISABLE_DYNLOADING) # define SAL_DLLPUBLIC_EXPORT __attribute__ ((visibility("hidden"))) +# define SAL_JNI_EXPORT __attribute__ ((visibility("default"))) # define SAL_DLLPUBLIC_IMPORT __attribute__ ((visibility("hidden"))) # define SAL_DLLPRIVATE __attribute__ ((visibility("hidden"))) # define SAL_DLLPUBLIC_TEMPLATE __attribute__ ((visibility("hidden"))) # else # define SAL_DLLPUBLIC_EXPORT __attribute__ ((visibility("default"))) +# define SAL_JNI_EXPORT __attribute__ ((visibility("default"))) # define SAL_DLLPUBLIC_IMPORT __attribute__ ((visibility("default"))) # define SAL_DLLPRIVATE __attribute__ ((visibility("hidden"))) # define SAL_DLLPUBLIC_TEMPLATE __attribute__ ((visibility("default"))) # endif # else # define SAL_DLLPUBLIC_EXPORT +# define SAL_JNI_EXPORT # define SAL_DLLPUBLIC_IMPORT # define SAL_DLLPRIVATE # define SAL_DLLPUBLIC_TEMPLATE |