FreeChainXenon/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

jni.cc (JNI_CreateJavaVM): Remove JNIEXPORT.

Browse source 
* jni.cc (JNI_CreateJavaVM): Remove JNIEXPORT.
	(JNI_GetCreatedJavaVMs): Likewise.
	(JNI_GetDefaultJavaVMInitArgs): Likewise.
	* include/jni.h (JNIIMPEXP): Remove definition
	and replace with...
	(__GCJ_JNIIMPEXP__): New macro, applicable only to libgcj
	symbols,
	(__GCJ_DLL__): New macro, controlling __GCJ_JNIIMPEXP__.

From-SVN: r73484
This commit is contained in:
Danny Smith 2003-11-12 05:56:44 +00:00 • committed by Mohan Embar
parent 22e5c8fa3c
commit 2fe6fc5268
3 changed files with 37 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
libjava/ChangeLog
View file

@ -1,3 +1,14 @@
2003-11-11 Danny Smith <dannysmith@users.sourceforge.net>
* jni.cc (JNI_CreateJavaVM): Remove JNIEXPORT.
(JNI_GetCreatedJavaVMs): Likewise.
(JNI_GetDefaultJavaVMInitArgs): Likewise.
* include/jni.h (JNIIMPEXP): Remove definition
and replace with...
(__GCJ_JNIIMPEXP__): New macro, applicable only to libgcj
symbols,
(__GCJ_DLL__): New macro, controlling __GCJ_JNIIMPEXP__.
2003-11-11 Thomas Fitzsimmons <fitzsim@redhat.com> 2003-11-11 Thomas Fitzsimmons <fitzsim@redhat.com>
* Makefile.am: Add GdkPixbufDecoder.java and * Makefile.am: Add GdkPixbufDecoder.java and

33
libjava/include/jni.h
View file

@ -178,22 +178,30 @@ typedef void *jmethodID;
#define JNIIMPORT __declspec(dllimport) #define JNIIMPORT __declspec(dllimport)
#define JNIEXPORT __declspec(dllexport) #define JNIEXPORT __declspec(dllexport)
#define JNICALL __stdcall #define JNICALL __stdcall
#else /* These defines apply to symbols in libgcj */
#ifdef __GCJ_DLL__
# ifdef __GCJ_JNI_IMPL__
# define __GCJ_JNIIMPEXP__ JNIEXPORT
# else
# define __GCJ_JNIIMPEXP__ JNIIMPORT
# endif /* ! __GCJ_JNI_IMPL__ */
#else /* ! __GCJ_DLL__ */
# define __GCJ_JNIIMPEXP__
#endif /* __GCJ_DLL__ */
#else /* !( _WIN32 || __WIN32__ || WIN32) */
#define JNIIMPORT #define JNIIMPORT
#define JNIEXPORT #define JNIEXPORT
#define JNICALL #define JNICALL
#define __GCJ_JNIIMPEXP__
#endif /* !( _WIN32 || __WIN32__ || WIN32) */ #endif /* !( _WIN32 || __WIN32__ || WIN32) */
#ifdef __GCJ_JNI_IMPL__
#define JNIIMPEXP JNIEXPORT
#else
#define JNIIMPEXP JNIIMPORT
#endif /* ! __GCJ_JNI_IMPL__ */
#ifdef __cplusplus #ifdef __cplusplus
extern "C" extern "C"
{ {
@ -206,9 +214,14 @@ extern JNIEXPORT void JNICALL JNI_OnUnload (JavaVM *, void *);
/* These functions are called by user code to start using the /* These functions are called by user code to start using the
invocation API. */ invocation API. */
extern JNIIMPEXP jint JNICALL JNI_GetDefaultJavaVMInitArgs (void *); extern __GCJ_JNIIMPEXP__ jint JNICALL
extern JNIIMPEXP jint JNICALL JNI_CreateJavaVM (JavaVM **, void **, void *); JNI_GetDefaultJavaVMInitArgs (void *);
extern JNIIMPEXP jint JNICALL JNI_GetCreatedJavaVMs(JavaVM **, jsize, jsize *);
extern __GCJ_JNIIMPEXP__ jint JNICALL
JNI_CreateJavaVM (JavaVM **, void **, void *);
extern __GCJ_JNIIMPEXP__ jint JNICALL
JNI_GetCreatedJavaVMs(JavaVM **, jsize, jsize *);
#ifdef __cplusplus #ifdef __cplusplus
} }

6
libjava/jni.cc
View file

@ -2377,7 +2377,7 @@ static jint
return 0; return 0;
} }
JNIEXPORT jint JNICALL jint JNICALL
JNI_GetDefaultJavaVMInitArgs (void *args) JNI_GetDefaultJavaVMInitArgs (void *args)
{ {
jint version = * (jint *) args; jint version = * (jint *) args;
@ -2394,7 +2394,7 @@ JNI_GetDefaultJavaVMInitArgs (void *args)
return 0; return 0;
} }
JNIEXPORT jint JNICALL jint JNICALL
JNI_CreateJavaVM (JavaVM **vm, void **penv, void *args) JNI_CreateJavaVM (JavaVM **vm, void **penv, void *args)
{ {
JvAssert (! the_vm); JvAssert (! the_vm);
@ -2459,7 +2459,7 @@ JNI_CreateJavaVM (JavaVM **vm, void **penv, void *args)
return 0; return 0;
} }
JNIEXPORT jint JNICALL jint JNICALL
JNI_GetCreatedJavaVMs (JavaVM **vm_buffer, jsize buf_len, jsize *n_vms) JNI_GetCreatedJavaVMs (JavaVM **vm_buffer, jsize buf_len, jsize *n_vms)
{ {
if (buf_len <= 0) if (buf_len <= 0)