summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorTom Tromey <tromey@redhat.com>2004-05-14 16:34:49 +0000
committerTom Tromey <tromey@redhat.com>2004-05-14 16:34:49 +0000
commit90b38e6c968475f70bc76dd4fc7d0e8c7b51ede7 (patch)
tree74ba535ebd47be8252d48cc33ff965b394b1065c /include
parentb3445c5259cc8725724d7d3c02fc51047974a694 (diff)
downloadclasspath-90b38e6c968475f70bc76dd4fc7d0e8c7b51ede7.tar.gz
2004-05-14 Steven Augart <augart@watson.ibm.com>
* include/jni.h.in (_Jv_func): Removed. (struct JNINativeInterface): Use `void *' for reserved slots. (struct JNIInvokeInterface): Likewise.
Diffstat (limited to 'include')
-rw-r--r--include/jni.h.in20
1 files changed, 7 insertions, 13 deletions
diff --git a/include/jni.h.in b/include/jni.h.in
index 373797e56..8908ef52f 100644
--- a/include/jni.h.in
+++ b/include/jni.h.in
@@ -132,12 +132,6 @@ typedef const struct JNIInvokeInterface *JavaVM;
#endif /* __cplusplus */
-#ifdef __cplusplus
-typedef void * (*_Jv_func) (...);
-#else
-typedef void * (*_Jv_func) ();
-#endif
-
#define _Jv_va_list va_list
#ifdef __cplusplus
@@ -202,10 +196,10 @@ typedef struct
struct JNINativeInterface
{
- _Jv_func reserved0; /* 0 */
- _Jv_func reserved1; /* 1 */
- _Jv_func reserved2; /* 2 */
- _Jv_func reserved3; /* 3 */
+ void *reserved0; /* 0 */
+ void *reserved1; /* 1 */
+ void *reserved2; /* 2 */
+ void *reserved3; /* 3 */
jint (JNICALL *GetVersion) (JNIEnv *); /* 4 */
jclass (JNICALL *DefineClass) (JNIEnv *, const char *, jobject, const jbyte *, jsize); /* 5 */
@@ -1355,9 +1349,9 @@ struct _Jv_JNIEnv
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 *);