infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-02-12 11:28:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

8008509: 6588413 changed JNIEXPORT visibility for GCC on HSX, jdk's jni_md.h needs similar change

Browse Source 
Define JNIEXPORT to use "default" visibility where possible.

Reviewed-by: coleenp, ddehaven, dcubed, anthony
This commit is contained in:
Martin Buchholz 2013-04-15 14:07:17 -07:00
parent 7d3f26a18f
commit 67e05359fc
4 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
jdk/src/share/native/sun/java2d/loops/GraphicsPrimitiveMgr.h
View File

@ -143,9 +143,9 @@ typedef struct _SurfaceType {
* structure from the information present in a given Java Composite
* object.
*/
typedef JNIEXPORT void (JNICALL CompInfoFunc)(JNIEnv *env,
CompositeInfo *pCompInfo,
jobject Composite);
typedef void (JNICALL CompInfoFunc)(JNIEnv *env,
CompositeInfo *pCompInfo,
jobject Composite);
/*
* The additional information needed to implement a primitive that

8
jdk/src/share/npt/npt.h
View File

@ -94,13 +94,13 @@ typedef struct {
JNIEXPORT void JNICALL nptInitialize
(NptEnv **pnpt, char *nptVersion, char *options);
typedef JNIEXPORT void (JNICALL *NptInitialize)
(NptEnv **pnpt, char *nptVersion, char *options);
typedef void (JNICALL *NptInitialize)
(NptEnv **pnpt, char *nptVersion, char *options);
JNIEXPORT void JNICALL nptTerminate
(NptEnv* npt, char *options);
typedef JNIEXPORT void (JNICALL *NptTerminate)
(NptEnv* npt, char *options);
typedef void (JNICALL *NptTerminate)
(NptEnv* npt, char *options);
#ifdef __cplusplus
} /* extern "C" */

13
jdk/src/solaris/javavm/export/jni_md.h
View File

@ -26,8 +26,17 @@
#ifndef _JAVASOFT_JNI_MD_H_
#define _JAVASOFT_JNI_MD_H_
#define JNIEXPORT
#define JNIIMPORT
#ifndef __has_attribute
#define __has_attribute(x) 0
#endif
#if (defined(__GNUC__) && ((__GNUC__ > 4) || (__GNUC__ == 4) && (__GNUC_MINOR__ > 2))) || __has_attribute(visibility)
#define JNIEXPORT __attribute__((visibility("default")))
#define JNIIMPORT __attribute__((visibility("default")))
#else
#define JNIEXPORT
#define JNIIMPORT
#endif
#define JNICALL
typedef int jint;

6
jdk/src/solaris/native/sun/awt/awt_LoadLibrary.c
View File

@ -43,7 +43,7 @@
static void *awtHandle = NULL;
typedef JNIEXPORT jint JNICALL JNI_OnLoad_type(JavaVM *vm, void *reserved);
typedef jint JNICALL JNI_OnLoad_type(JavaVM *vm, void *reserved);
/* Initialize the Java VM instance variable when the library is
first loaded */
@ -206,7 +206,7 @@ Java_sun_awt_motif_XsessionWMcommand(JNIEnv *env, jobject this,
jobject frame, jstring jcommand)
{
/* type of the old backdoor function */
typedef JNIEXPORT void JNICALL
typedef void JNICALL
XsessionWMcommand_type(JNIEnv *env, jobject this,
jobject frame, jstring jcommand);
@ -234,7 +234,7 @@ Java_sun_awt_motif_XsessionWMcommand(JNIEnv *env, jobject this,
JNIEXPORT void JNICALL
Java_sun_awt_motif_XsessionWMcommand_New(JNIEnv *env, jobjectArray jargv)
{
typedef JNIEXPORT void JNICALL
typedef void JNICALL
XsessionWMcommand_New_type(JNIEnv *env, jobjectArray jargv);
static XsessionWMcommand_New_type *XsessionWMcommand = NULL;