diff options
| author | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-05-14 16:35:07 +0000 |
|---|---|---|
| committer | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-05-14 16:35:07 +0000 |
| commit | 70bc073040f760d67ec8d2a3f329ff8a3482faf7 (patch) | |
| tree | 99f7ab656e94391404f72c482d6c05db4dcef0a9 /libjava | |
| parent | a76bfe086d9362567741ed0e3660455659cff3a2 (diff) | |
| download | gcc-70bc073040f760d67ec8d2a3f329ff8a3482faf7.tar.gz | |
2004-05-14 Steven Augart <augart@watson.ibm.com>
* include/jni.h (_Jv_func): Removed.
(struct JNINativeInterface): Use `void *' for reserved slots.
(struct JNIInvokeInterface): Likewise.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@81851 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 6 | ||||
| -rw-r--r-- | libjava/include/jni.h | 22 |
2 files changed, 14 insertions, 14 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 72df26c590f..f78f86cb275 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,9 @@ +2004-05-14 Steven Augart <augart@watson.ibm.com> + + * include/jni.h (_Jv_func): Removed. + (struct JNINativeInterface): Use `void *' for reserved slots. + (struct JNIInvokeInterface): Likewise. + 2004-05-11 Michael Koch <konqueror@gmx.de> * gnu/java/net/natPlainSocketImplPosix.cc diff --git a/libjava/include/jni.h b/libjava/include/jni.h index 4e39e646f51..51fa7cbe1f6 100644 --- a/libjava/include/jni.h +++ b/libjava/include/jni.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1998, 1999, 2000, 2001, 2002 Free Software Foundation +/* Copyright (C) 1998, 1999, 2000, 2001, 2002, 2004 Free Software Foundation This file is part of libgcj. @@ -240,12 +240,6 @@ typedef union jvalue jobject l; } jvalue; -#ifdef __cplusplus -typedef void * (*_Jv_func) (...); -#else -typedef void * (*_Jv_func) (); -#endif - /* This structure is used when registering native methods. */ typedef struct { @@ -256,10 +250,10 @@ typedef struct struct JNINativeInterface { - _Jv_func reserved0; - _Jv_func reserved1; - _Jv_func reserved2; - _Jv_func reserved3; + void *reserved0; + void *reserved1; + void *reserved2; + void *reserved3; jint (JNICALL *GetVersion) (JNIEnv *); jclass (JNICALL *DefineClass) (JNIEnv *, const char *, @@ -1574,9 +1568,9 @@ public: struct JNIInvokeInterface { - _Jv_func reserved0; - _Jv_func reserved1; - _Jv_func reserved2; + void *reserved0; + void *reserved1; + void *reserved2; jint (JNICALL *DestroyJavaVM) (JavaVM *); jint (JNICALL *AttachCurrentThread) (JavaVM *, void **, void *); |