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

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index b2a035a..bd350f8 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,9 @@
+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>
 
        * java/awt/GridLayout.java (setColumns): Check newCols, not cols.

diff --git a/libjava/include/jni.h b/libjava/include/jni.h
index b5ce334..07a21e6 100644 (file)
--- a/libjava/include/jni.h
+++ b/libjava/include/jni.h
@@ -173,12 +173,21 @@ typedef void *jmethodID;
 #define JNI_EDETACHED    -2
 #define JNI_EVERSION     -3
 
-/* Linkage and calling conventions.  This will need updating when we
-   support Windows DLLs.  */
+/* Linkage and calling conventions. */
+#if defined(_WIN32) || defined (__WIN32__) || defined (WIN32)
+
+#define JNIIMPORT        __declspec(dllimport)
+#define JNIEXPORT        __declspec(dllexport)
+#define JNICALL          __stdcall
+
+#else
+
 #define JNIIMPORT
 #define JNIEXPORT
 #define JNICALL
 
+#endif /* !( _WIN32 || __WIN32__ || WIN32) */
+
 #ifdef __cplusplus
 extern "C"
 {