From: Tom Tromey <tromey@redhat.com>
Date: Wed, 6 Nov 2002 22:10:30 +0000 (+0000)
Subject: gjavah.c (print_stub_or_jni): Include JNIEXPORT and JNICALL in a JNI header.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=5bd717f157eb15478552ec432f30ea32ffe5bc1d;p=gcc.git

gjavah.c (print_stub_or_jni): Include JNIEXPORT and JNICALL in a JNI header.

	* gjavah.c (print_stub_or_jni): Include JNIEXPORT and JNICALL in
	a JNI header.

From-SVN: r58867
---

diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index 4b1ee3edeaf..74bb4e548b8 100644
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,8 @@
+2002-11-06  Tom Tromey  <tromey@redhat.com>
+
+	* gjavah.c (print_stub_or_jni): Include JNIEXPORT and JNICALL in
+	a JNI header.
+
 2002-11-05  Tom Tromey  <tromey@redhat.com>
 
 	Fix for PR java/6388.
diff --git a/gcc/java/gjavah.c b/gcc/java/gjavah.c
index 3d7e32e0022..1e8c701e24e 100644
--- a/gcc/java/gjavah.c
+++ b/gcc/java/gjavah.c
@@ -1565,7 +1565,7 @@ DEFUN(print_stub_or_jni, (stream, jcf, name_index, signature_index, is_init,
 	return;
 
       if (flag_jni && ! stubs)
-	fputs ("extern ", stream);
+	fputs ("extern JNIEXPORT ", stream);
 
       /* If printing a method, skip to the return signature and print
 	 that first.  However, there is no return value if this is a
@@ -1597,6 +1597,9 @@ DEFUN(print_stub_or_jni, (stream, jcf, name_index, signature_index, is_init,
       /* When printing a JNI header we need to respect the space.  In
 	 other cases we're just going to insert a newline anyway.  */
       fputs (need_space && ! stubs ? " " : "\n", stream);
+
+      if (flag_jni && ! stubs)
+	fputs ("JNICALL ", stream);
       
       /* Now print the name of the thing.  */
       print_name_for_stub_or_jni (stream, jcf, name_index,