Commit a2eb270a by Ranjit Mathew Committed by Tom Tromey

jni.h (JNIIMPORT, [...]): Linker defines for Win32.

2002-11-08  Ranjit Mathew <rmathew@hotmail.com>

	* include/jni.h (JNIIMPORT, JNIEXPORT, JNICALL): Linker defines
	for Win32. JNICALL has been defined to __stdcall to be compatible
	with Sun's JDKs.

From-SVN: r58985
parent 44e8d1f0
2002-11-08 Ranjit Mathew <rmathew@hotmail.com>
* include/jni.h (JNIIMPORT, JNIEXPORT, JNICALL): Linker defines
for Win32. JNICALL has been defined to __stdcall to be compatible
with Sun's JDKs.
2002-11-10 Tom Tromey <tromey@redhat.com> 2002-11-10 Tom Tromey <tromey@redhat.com>
* java/awt/GridLayout.java (setColumns): Check newCols, not cols. * java/awt/GridLayout.java (setColumns): Check newCols, not cols.
......
...@@ -173,12 +173,21 @@ typedef void *jmethodID; ...@@ -173,12 +173,21 @@ typedef void *jmethodID;
#define JNI_EDETACHED -2 #define JNI_EDETACHED -2
#define JNI_EVERSION -3 #define JNI_EVERSION -3
/* Linkage and calling conventions. This will need updating when we /* Linkage and calling conventions. */
support Windows DLLs. */ #if defined(_WIN32) || defined (__WIN32__) || defined (WIN32)
#define JNIIMPORT __declspec(dllimport)
#define JNIEXPORT __declspec(dllexport)
#define JNICALL __stdcall
#else
#define JNIIMPORT #define JNIIMPORT
#define JNIEXPORT #define JNIEXPORT
#define JNICALL #define JNICALL
#endif /* !( _WIN32 || __WIN32__ || WIN32) */
#ifdef __cplusplus #ifdef __cplusplus
extern "C" extern "C"
{ {
......
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