From: tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Sun, 10 Nov 2002 17:38:08 +0000 (+0000)
Subject: 2002-11-08  Ranjit Mathew <rmathew@hotmail.com>
X-Git-Tag: upstream/4.9.2~83495
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=65daa6847d0f4f88870e67912ea645871ce11818;p=platform%2Fupstream%2Flinaro-gcc.git

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.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@58985 138bc75d-0d04-0410-961f-82ee72b054a4
---

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index b2a035a..bd350f8 100644
--- 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
--- 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"
 {