calls.c (Java_calls_docall): Define with JNIEXPORT and JNICALL method attributes.

2003-01-24  Ranjit Mathew  <rmathew@hotmail.com>

	* libjava.jni/calls.c (Java_calls_docall): Define with
	JNIEXPORT and JNICALL method attributes.
	* libjava.jni/field.c (Java_field_fetch): Likewise.
	* libjava.jni/final_method.c (Java_final_1method_meth): Likewise.
	* libjava.jni/findclass.c (Java_findclass_doit): Likewise.
	* libjava.jni/invoke.c (Java_invoke_val): Likewise.
	* libjava.jni/martin.c (Java_martin_myNative): Likewise.
	* libjava.jni/noclass.c (Java_noclass_find_1it): Likewise.
	* libjava.jni/overload.c (Java_overload_over__I): Likewise.
	(Java_overload_over__II): Likewise.
	* libjava.jni/register.c (JNI_OnLoad): Likewise.
	* libjava.jni/simple_int.c (Java_simple_1int_nat): Likewise.
	* libjava.jni/throwit.c (Java_throwit_throwit): Likewise.
	* libjava.jni/virtual.c (Java_virtual_equals): Likewise.

From-SVN: r61720

diff --git a/libjava/testsuite/ChangeLog b/libjava/testsuite/ChangeLog
index 4735558e53de7ffaf1f61fc16e492d61970432c3..a359f115f109324243022ac08b4fee530092ef3e 100644 (file)
--- a/libjava/testsuite/ChangeLog
+++ b/libjava/testsuite/ChangeLog
@@ -1,3 +1,20 @@
+2003-01-24  Ranjit Mathew  <rmathew@hotmail.com>
+
+       * libjava.jni/calls.c (Java_calls_docall): Define with
+       JNIEXPORT and JNICALL method attributes.
+       * libjava.jni/field.c (Java_field_fetch): Likewise.
+       * libjava.jni/final_method.c (Java_final_1method_meth): Likewise.
+       * libjava.jni/findclass.c (Java_findclass_doit): Likewise.
+       * libjava.jni/invoke.c (Java_invoke_val): Likewise.
+       * libjava.jni/martin.c (Java_martin_myNative): Likewise.
+       * libjava.jni/noclass.c (Java_noclass_find_1it): Likewise.
+       * libjava.jni/overload.c (Java_overload_over__I): Likewise.
+       (Java_overload_over__II): Likewise.
+       * libjava.jni/register.c (JNI_OnLoad): Likewise.
+       * libjava.jni/simple_int.c (Java_simple_1int_nat): Likewise.
+       * libjava.jni/throwit.c (Java_throwit_throwit): Likewise.
+       * libjava.jni/virtual.c (Java_virtual_equals): Likewise.
+
 2003-01-21  Tom Tromey  <tromey@redhat.com>
 
        * libjava.jacks/jacks.xfail: All 8.4.3 tests and 9.4-modifier-10

diff --git a/libjava/testsuite/libjava.jni/calls.c b/libjava/testsuite/libjava.jni/calls.c
index 080e5271cfb5ac4335cce33c14a5f5bba2a2f76c..dd54005ba18f04551275b64e7a202fbcb46c3d7f 100644 (file)
--- a/libjava/testsuite/libjava.jni/calls.c
+++ b/libjava/testsuite/libjava.jni/calls.c
@@ -1,7 +1,7 @@
 #include <stdio.h>
 #include <calls.h>
 
-jint
+JNIEXPORT jint JNICALL
 Java_calls_docall (JNIEnv *env, jobject _this)
 {
   jmethodID method;

diff --git a/libjava/testsuite/libjava.jni/field.c b/libjava/testsuite/libjava.jni/field.c
index 358c293e7c5518028013f7e474d6601097ce08fb..bce0cc896e62bbe87185a68e95ccbb9a0c900dba 100644 (file)
--- a/libjava/testsuite/libjava.jni/field.c
+++ b/libjava/testsuite/libjava.jni/field.c
@@ -1,7 +1,7 @@
 #include <jni.h>
 #include <field.h>
 
-jobjectArray
+JNIEXPORT jobjectArray JNICALL
 Java_field_fetch (JNIEnv *env, jobject this)
 {
   jclass cls;

diff --git a/libjava/testsuite/libjava.jni/final_method.c b/libjava/testsuite/libjava.jni/final_method.c
index 82977374bcbbd64060cc7256806d3fdc90777e92..76d5ae528273954e6e33fe9fe375134056d48145 100644 (file)
--- a/libjava/testsuite/libjava.jni/final_method.c
+++ b/libjava/testsuite/libjava.jni/final_method.c
@@ -1,6 +1,6 @@
 #include <final_method.h>
 
-jstring
+JNIEXPORT jstring JNICALL
 Java_final_1method_meth (JNIEnv *env, jobject thisv)
 {
   return (*env)->NewStringUTF (env, "zardoz has spoken");

diff --git a/libjava/testsuite/libjava.jni/findclass.c b/libjava/testsuite/libjava.jni/findclass.c
index 9a71508ab3f6a9ab5bb8aecc54061a4dffc1b760..1a58a55fee477e81f9309b3eef48c19604e61ea3 100644 (file)
--- a/libjava/testsuite/libjava.jni/findclass.c
+++ b/libjava/testsuite/libjava.jni/findclass.c
@@ -2,7 +2,7 @@
 
 #include <findclass.h>
 
-jclass
+JNIEXPORT jclass JNICALL
 Java_findclass_doit (JNIEnv *env, jclass klass, jstring name)
 {
   const char *buf = (*env)->GetStringUTFChars (env, name, NULL);

diff --git a/libjava/testsuite/libjava.jni/invoke.c b/libjava/testsuite/libjava.jni/invoke.c
index 35a446eae25bee9db1580903a9c5f8672eee99d3..c2b78d239cb7e762ec64582b728124b75f0b62ad 100644 (file)
--- a/libjava/testsuite/libjava.jni/invoke.c
+++ b/libjava/testsuite/libjava.jni/invoke.c
@@ -1,6 +1,6 @@
 #include <invoke.h>
 
-jint
+JNIEXPORT jint JNICALL
 Java_invoke_val (JNIEnv *env, jclass klass)
 {
   return 23;

diff --git a/libjava/testsuite/libjava.jni/martin.c b/libjava/testsuite/libjava.jni/martin.c
index 947bd452c046a2cfc0fe74904df302625cc87b67..0fbb8d0aa73cc8ac202fc6324f9df2e0d1d3109e 100644 (file)
--- a/libjava/testsuite/libjava.jni/martin.c
+++ b/libjava/testsuite/libjava.jni/martin.c
@@ -2,7 +2,8 @@
 #include "martin.h"
 #include <stdio.h>
 
-void Java_martin_myNative(JNIEnv* env, jobject this, jstring s)
+JNIEXPORT void JNICALL
+Java_martin_myNative(JNIEnv* env, jobject this, jstring s)
 {
   jclass cls;
   jfieldID fid;

diff --git a/libjava/testsuite/libjava.jni/noclass.c b/libjava/testsuite/libjava.jni/noclass.c
index 5f2caf428aeccc23c99897e00689ffb878451b12..87c649c30e61987fbc6280e224514fb55e7452ba 100644 (file)
--- a/libjava/testsuite/libjava.jni/noclass.c
+++ b/libjava/testsuite/libjava.jni/noclass.c
@@ -1,6 +1,6 @@
 #include <noclass.h>
 
-void
+JNIEXPORT void JNICALL
 Java_noclass_find_1it (JNIEnv *env, jclass k)
 {
   /* We cause an exception by asking for a class we know does not

diff --git a/libjava/testsuite/libjava.jni/overload.c b/libjava/testsuite/libjava.jni/overload.c
index d171fc3ac9b32776325644877e709c4ec6a3400a..4e7a2d9289b9eadc615774da64d9f8dae5100ca1 100644 (file)
--- a/libjava/testsuite/libjava.jni/overload.c
+++ b/libjava/testsuite/libjava.jni/overload.c
@@ -1,13 +1,13 @@
 #include <overload.h>
 
-jint
+JNIEXPORT jint JNICALL
 Java_overload_over__I (JNIEnv *env, jclass klass, jint val)
 {
   return val;
 }
 
 
-jint
+JNIEXPORT jint JNICALL
 Java_overload_over__II (JNIEnv *env, jclass klass, jint one, jint two)
 {
   return one + two;

diff --git a/libjava/testsuite/libjava.jni/register.c b/libjava/testsuite/libjava.jni/register.c
index 738182cf0f6e7f52e07d90ea943ecb97349bcea2..0490902420e95d3d5b813b47e4aca69d08f19a76 100644 (file)
--- a/libjava/testsuite/libjava.jni/register.c
+++ b/libjava/testsuite/libjava.jni/register.c
@@ -8,7 +8,7 @@ some_random_name (JNIEnv *env, jclass k, jint v)
   return v - 1;
 }
 
-jint
+JNIEXPORT jint JNICALL
 JNI_OnLoad (JavaVM *vm, void *nothing)
 {
   JNIEnv *env;

diff --git a/libjava/testsuite/libjava.jni/simple_int.c b/libjava/testsuite/libjava.jni/simple_int.c
index a86f2d2babd7f20c3c9e0796b5550e531db9ab59..a7c64b0cd5f8a02f6f37f36c25eb348be95cc3bd 100644 (file)
--- a/libjava/testsuite/libjava.jni/simple_int.c
+++ b/libjava/testsuite/libjava.jni/simple_int.c
@@ -1,6 +1,6 @@
 #include <simple_int.h>
 
-jint
+JNIEXPORT jint JNICALL
 Java_simple_1int_nat (JNIEnv *env, jclass klass, jint val)
 {
   return 2 * val;

diff --git a/libjava/testsuite/libjava.jni/throwit.c b/libjava/testsuite/libjava.jni/throwit.c
index 0b02459b464c9a2a11dacfc08145532e3f057ecb..34a3ca0767673c737e3fd3ac95cd3265c7c70e5d 100644 (file)
--- a/libjava/testsuite/libjava.jni/throwit.c
+++ b/libjava/testsuite/libjava.jni/throwit.c
@@ -1,7 +1,7 @@
 #include <stdlib.h>
 #include <throwit.h>
 
-void
+JNIEXPORT void JNICALL
 Java_throwit_throwit (JNIEnv *env, jclass klass, jstring name,
                      jboolean is_new)
 {

diff --git a/libjava/testsuite/libjava.jni/virtual.c b/libjava/testsuite/libjava.jni/virtual.c
index bda837df10297870b7a93ddaf6efbc770efcf680..0246970835b7e47030e5bd753536d43240d8bb14 100644 (file)
--- a/libjava/testsuite/libjava.jni/virtual.c
+++ b/libjava/testsuite/libjava.jni/virtual.c
@@ -1,6 +1,6 @@
 #include <virtual.h>
 
-jboolean
+JNIEXPORT jboolean JNICALL
 Java_virtual_equals (JNIEnv *env, jobject thisv, jobject other)
 {
   return JNI_FALSE;