From 38997f1bf5ea21dc05d978620d031da33083093d Mon Sep 17 00:00:00 2001 From: Ranjit Mathew Date: Fri, 24 Jan 2003 17:39:49 +0000 Subject: [PATCH] calls.c (Java_calls_docall): Define with JNIEXPORT and JNICALL method attributes. 2003-01-24 Ranjit Mathew * 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 --- libjava/testsuite/ChangeLog | 17 +++++++++++++++++ libjava/testsuite/libjava.jni/calls.c | 2 +- libjava/testsuite/libjava.jni/field.c | 2 +- libjava/testsuite/libjava.jni/final_method.c | 2 +- libjava/testsuite/libjava.jni/findclass.c | 2 +- libjava/testsuite/libjava.jni/invoke.c | 2 +- libjava/testsuite/libjava.jni/martin.c | 3 ++- libjava/testsuite/libjava.jni/noclass.c | 2 +- libjava/testsuite/libjava.jni/overload.c | 4 ++-- libjava/testsuite/libjava.jni/register.c | 2 +- libjava/testsuite/libjava.jni/simple_int.c | 2 +- libjava/testsuite/libjava.jni/throwit.c | 2 +- libjava/testsuite/libjava.jni/virtual.c | 2 +- 13 files changed, 31 insertions(+), 13 deletions(-) diff --git a/libjava/testsuite/ChangeLog b/libjava/testsuite/ChangeLog index 4735558e53d..a359f115f10 100644 --- a/libjava/testsuite/ChangeLog +++ b/libjava/testsuite/ChangeLog @@ -1,3 +1,20 @@ +2003-01-24 Ranjit Mathew + + * 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 * 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 080e5271cfb..dd54005ba18 100644 --- a/libjava/testsuite/libjava.jni/calls.c +++ b/libjava/testsuite/libjava.jni/calls.c @@ -1,7 +1,7 @@ #include #include -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 358c293e7c5..bce0cc896e6 100644 --- a/libjava/testsuite/libjava.jni/field.c +++ b/libjava/testsuite/libjava.jni/field.c @@ -1,7 +1,7 @@ #include #include -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 82977374bcb..76d5ae52827 100644 --- a/libjava/testsuite/libjava.jni/final_method.c +++ b/libjava/testsuite/libjava.jni/final_method.c @@ -1,6 +1,6 @@ #include -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 9a71508ab3f..1a58a55fee4 100644 --- a/libjava/testsuite/libjava.jni/findclass.c +++ b/libjava/testsuite/libjava.jni/findclass.c @@ -2,7 +2,7 @@ #include -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 35a446eae25..c2b78d239cb 100644 --- a/libjava/testsuite/libjava.jni/invoke.c +++ b/libjava/testsuite/libjava.jni/invoke.c @@ -1,6 +1,6 @@ #include -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 947bd452c04..0fbb8d0aa73 100644 --- a/libjava/testsuite/libjava.jni/martin.c +++ b/libjava/testsuite/libjava.jni/martin.c @@ -2,7 +2,8 @@ #include "martin.h" #include -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 5f2caf428ae..87c649c30e6 100644 --- a/libjava/testsuite/libjava.jni/noclass.c +++ b/libjava/testsuite/libjava.jni/noclass.c @@ -1,6 +1,6 @@ #include -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 d171fc3ac9b..4e7a2d9289b 100644 --- a/libjava/testsuite/libjava.jni/overload.c +++ b/libjava/testsuite/libjava.jni/overload.c @@ -1,13 +1,13 @@ #include -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 738182cf0f6..0490902420e 100644 --- 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 a86f2d2babd..a7c64b0cd5f 100644 --- a/libjava/testsuite/libjava.jni/simple_int.c +++ b/libjava/testsuite/libjava.jni/simple_int.c @@ -1,6 +1,6 @@ #include -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 0b02459b464..34a3ca07676 100644 --- a/libjava/testsuite/libjava.jni/throwit.c +++ b/libjava/testsuite/libjava.jni/throwit.c @@ -1,7 +1,7 @@ #include #include -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 bda837df102..0246970835b 100644 --- a/libjava/testsuite/libjava.jni/virtual.c +++ b/libjava/testsuite/libjava.jni/virtual.c @@ -1,6 +1,6 @@ #include -jboolean +JNIEXPORT jboolean JNICALL Java_virtual_equals (JNIEnv *env, jobject thisv, jobject other) { return JNI_FALSE; -- 2.30.2