diff options
| author | Tom Tromey <tromey@cygnus.com> | 2000-02-10 23:44:05 +0000 |
|---|---|---|
| committer | Tom Tromey <tromey@gcc.gnu.org> | 2000-02-10 23:44:05 +0000 |
| commit | 26439cc59cd34989b7a98d676a5e210302da15c0 (patch) | |
| tree | 562b3aef02d2a90b35345c3a26ea5e694ef08263 /libjava | |
| parent | 75cdca5bb9b8b302a366c12be6073e5e29a38338 (diff) | |
| download | gcc-26439cc59cd34989b7a98d676a5e210302da15c0.tar.gz | |
jni.h (JNI_FALSE): Renamed from JNI_TRUE; oops.
* 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.
From-SVN: r31907
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 4 | ||||
| -rw-r--r-- | libjava/include/jni.h | 12 |
2 files changed, 12 insertions, 4 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 91485fc98b0..8bea0c78fd9 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,5 +1,9 @@ 2000-02-10 Tom Tromey <tromey@cygnus.com> + * 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 35477797f40..789cdeef56c 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 |