From 36cf37bea77749a21754b4de93aa6a3f317605a6 Mon Sep 17 00:00:00 2001 From: tromey Date: Thu, 10 Feb 2000 23:44:05 +0000 Subject: [PATCH] * include/jni.h (JNI_FALSE): Renamed from JNI_TRUE; oops. (jboolean): Declare as an attributed int, not a bool. (_Jv_func): Declare differently for C. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@31907 138bc75d-0d04-0410-961f-82ee72b054a4 --- libjava/ChangeLog | 4 ++++ libjava/include/jni.h | 12 ++++++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 91485fc..8bea0c7 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,5 +1,9 @@ 2000-02-10 Tom Tromey + * include/jni.h (JNI_FALSE): Renamed from JNI_TRUE; oops. + (jboolean): Declare as an attributed int, not a bool. + (_Jv_func): Declare differently for C. + * gnu/gcj/jni/natNativeThread.cc: New file. * gnu/gcj/jni/NativeThread.java: New file. * java/lang/Thread.java (data): Now a RawData. diff --git a/libjava/include/jni.h b/libjava/include/jni.h index 3547779..789cdee 100644 --- a/libjava/include/jni.h +++ b/libjava/include/jni.h @@ -34,7 +34,7 @@ typedef int jbyte __attribute__((__mode__(__QI__))); typedef int jshort __attribute__((__mode__(__HI__))); typedef int jint __attribute__((__mode__(__SI__))); typedef int jlong __attribute__((__mode__(__DI__))); -typedef bool jboolean __attribute__((__mode__(__QI__))); +typedef int jboolean __attribute__((__mode__(__QI__))); typedef unsigned short jchar __attribute__((__mode__(__HI__))); typedef float jfloat; typedef double jdouble; @@ -62,8 +62,8 @@ typedef void *jmethodID; typedef const struct JNINativeInterface *JNIEnv; typedef const struct JNIInvokeInterface *JavaVM; -#define JNI_TRUE 1 -#define JNI_TRUE 0 +#define JNI_TRUE 1 +#define JNI_FALSE 0 #endif /* __cplusplus */ @@ -117,7 +117,11 @@ typedef union jvalue jobject l; } jvalue; -typedef void * (*_Jv_func)(...); +#ifdef __cplusplus +typedef void * (*_Jv_func) (...); +#else +typedef void * (*_Jv_func) (); +#endif /* This structure is used when registering native methods. */ typedef struct -- 2.7.4