From a01a235c76298c4f4e67e8128c416fe24724c865 Mon Sep 17 00:00:00 2001 From: Steven Augart Date: Fri, 14 May 2004 16:35:07 +0000 Subject: [PATCH] jni.h (_Jv_func): Removed. 2004-05-14 Steven Augart * include/jni.h (_Jv_func): Removed. (struct JNINativeInterface): Use `void *' for reserved slots. (struct JNIInvokeInterface): Likewise. From-SVN: r81851 --- libjava/ChangeLog | 6 ++++++ 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 + + * include/jni.h (_Jv_func): Removed. + (struct JNINativeInterface): Use `void *' for reserved slots. + (struct JNIInvokeInterface): Likewise. + 2004-05-11 Michael Koch * 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 *); -- 2.30.2