2000-08-02 Bryce McKinlay <bryce@albatross.co.nz>

        * interpret.cc (_Jv_InterpMethod::continue1): Type of `fun' changed
	to match C declaration in ffi.h.
	* Makefile.am: Add java/awt/Button.java.
	* Makefile.in: Rebuilt.

2000-07-29  Alexandre Petit-Bianco  <apbianco@cygnus.com>

        * java/lang/reflect/natMethod.cc (_Jv_CallAnyMethodA): Type of the
        cast of the second argument to `ffi_raw_call' changed to match
        prototype.

2000-07-26  Alexandre Petit-Bianco  <apbianco@cygnus.com>

        * jni.cc (_Jv_JNIMethod::call): Type of the cast of the second
        argument to `ffi_raw_call' changed to match prototype.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@35418 138bc75d-0d04-0410-961f-82ee72b054a4

6 files changed, 37 insertions, 16 deletions

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index f20f8dfca1f..86536ad0df4 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,21 @@
+2000-08-02  Bryce McKinlay  <bryce@albatross.co.nz>
+
+        * interpret.cc (_Jv_InterpMethod::continue1): Type of `fun' changed
+	to match C declaration in ffi.h.
+	* Makefile.am: Add java/awt/Button.java.
+	* Makefile.in: Rebuilt.
+
+2000-07-29  Alexandre Petit-Bianco  <apbianco@cygnus.com>
+
+        * java/lang/reflect/natMethod.cc (_Jv_CallAnyMethodA): Type of the
+        cast of the second argument to `ffi_raw_call' changed to match
+        prototype.
+
+2000-07-26  Alexandre Petit-Bianco  <apbianco@cygnus.com>
+
+        * jni.cc (_Jv_JNIMethod::call): Type of the cast of the second
+        argument to `ffi_raw_call' changed to match prototype.
+
 2000-07-31  Bryce McKinlay  <bryce@albatross.co.nz>
 
 	* java/awt/Component.java (toString): Implemented.
diff --git a/libjava/Makefile.am b/libjava/Makefile.am
index e558e1fcd2f..8e3fbfd96c0 100644
--- a/libjava/Makefile.am
+++ b/libjava/Makefile.am
@@ -494,6 +494,7 @@ java/awt/AWTEventMulticaster.java \
 java/awt/AWTException.java \
 java/awt/ActiveEvent.java \
 java/awt/Adjustable.java \
+java/awt/Button.java \
 java/awt/BorderLayout.java \
 java/awt/CheckboxGroup.java \
 java/awt/Color.java \
diff --git a/libjava/Makefile.in b/libjava/Makefile.in
index 87ceae1a44b..6b1ac695fed 100644
--- a/libjava/Makefile.in
+++ b/libjava/Makefile.in
@@ -270,6 +270,7 @@ java/awt/AWTEventMulticaster.java \
 java/awt/AWTException.java \
 java/awt/ActiveEvent.java \
 java/awt/Adjustable.java \
+java/awt/Button.java \
 java/awt/BorderLayout.java \
 java/awt/CheckboxGroup.java \
 java/awt/Color.java \
@@ -1048,14 +1049,15 @@ DEP_FILES =  .deps/$(srcdir)/$(CONVERT_DIR)/gen-from-JIS.P \
 .deps/java/awt/AWTError.P .deps/java/awt/AWTEvent.P \
 .deps/java/awt/AWTEventMulticaster.P .deps/java/awt/AWTException.P \
 .deps/java/awt/ActiveEvent.P .deps/java/awt/Adjustable.P \
-.deps/java/awt/BorderLayout.P .deps/java/awt/CheckboxGroup.P \
-.deps/java/awt/Color.P .deps/java/awt/Component.P \
-.deps/java/awt/ComponentOrientation.P .deps/java/awt/Container.P \
-.deps/java/awt/Cursor.P .deps/java/awt/Dimension.P \
-.deps/java/awt/Event.P .deps/java/awt/EventDispatchThread.P \
-.deps/java/awt/EventQueue.P .deps/java/awt/Font.P \
-.deps/java/awt/FontMetrics.P .deps/java/awt/Frame.P \
-.deps/java/awt/Graphics.P .deps/java/awt/GraphicsConfiguration.P \
+.deps/java/awt/BorderLayout.P .deps/java/awt/Button.P \
+.deps/java/awt/CheckboxGroup.P .deps/java/awt/Color.P \
+.deps/java/awt/Component.P .deps/java/awt/ComponentOrientation.P \
+.deps/java/awt/Container.P .deps/java/awt/Cursor.P \
+.deps/java/awt/Dimension.P .deps/java/awt/Event.P \
+.deps/java/awt/EventDispatchThread.P .deps/java/awt/EventQueue.P \
+.deps/java/awt/Font.P .deps/java/awt/FontMetrics.P \
+.deps/java/awt/Frame.P .deps/java/awt/Graphics.P \
+.deps/java/awt/GraphicsConfiguration.P \
 .deps/java/awt/IllegalComponentStateException.P .deps/java/awt/Image.P \
 .deps/java/awt/Insets.P .deps/java/awt/ItemSelectable.P \
 .deps/java/awt/Label.P .deps/java/awt/LayoutManager.P \
diff --git a/libjava/interpret.cc b/libjava/interpret.cc
index 069abdb2858..d6368d55480 100644
--- a/libjava/interpret.cc
+++ b/libjava/interpret.cc
@@ -406,7 +406,7 @@ void _Jv_InterpMethod::continue1 (_Jv_InterpMethodInvocation *inv)
   _Jv_word *pool_data   = defining_class->constants.data;
   
   /* these two are used in the invokeXXX instructions */
-  void (*fun)(...);
+  void (*fun)();
   _Jv_ResolvedMethod* rmeth;
 
 #define INSN_LABEL(op) &&insn_##op
@@ -684,13 +684,13 @@ void _Jv_InterpMethod::continue1 (_Jv_InterpMethodInvocation *inv)
 	  {
 	    // final methods do not appear in the vtable,
 	    // if it does not appear in the superclass.
-	    fun = (void (*) (...)) rmeth->method->ncode;
+	    fun = (void (*)()) rmeth->method->ncode;
 	  }
 	else
 	  {
 	    jobject rcv = sp[0].o;
 	    _Jv_VTable *table = *(_Jv_VTable**)rcv;
-	    fun = (void (*) (...))table->method[rmeth->vtable_index];
+	    fun = (void (*)()) table->method[rmeth->vtable_index];
 	  }
       }
       goto perform_invoke;
@@ -2149,7 +2149,7 @@ void _Jv_InterpMethod::continue1 (_Jv_InterpMethodInvocation *inv)
 
 	NULLCHECK(sp[0]);
 
-	fun = (void (*) (...))rmeth->method->ncode;
+	fun = (void (*)()) rmeth->method->ncode;
       }
       goto perform_invoke;
 
@@ -2163,7 +2163,7 @@ void _Jv_InterpMethod::continue1 (_Jv_InterpMethodInvocation *inv)
 	sp -= rmeth->stack_item_count;
 
 	_Jv_InitClass (rmeth->klass);
-	fun = (void (*) (...))rmeth->method->ncode;
+	fun = (void (*)()) rmeth->method->ncode;
       }
       goto perform_invoke;
 
@@ -2182,7 +2182,7 @@ void _Jv_InterpMethod::continue1 (_Jv_InterpMethodInvocation *inv)
 
 	jobject rcv = sp[0].o;
 
-	fun = (void (*) (...))
+	fun = (void (*)())
 	  _Jv_LookupInterfaceMethod (rcv->getClass (),
 				     rmeth->method->name,
 				     rmeth->method->signature);
diff --git a/libjava/java/lang/reflect/natMethod.cc b/libjava/java/lang/reflect/natMethod.cc
index ce4a15cfc17..b4d4e19160b 100644
--- a/libjava/java/lang/reflect/natMethod.cc
+++ b/libjava/java/lang/reflect/natMethod.cc
@@ -414,7 +414,7 @@ _Jv_CallAnyMethodA (jobject obj,
 
   try
     {
-      ffi_call (&cif, (void (*) (...)) meth->ncode, result, values);
+      ffi_call (&cif, (void (*)()) meth->ncode, result, values);
     }
   catch (Throwable *ex2)
     {
diff --git a/libjava/jni.cc b/libjava/jni.cc
index 020f7e85696..db13cdfb1a3 100644
--- a/libjava/jni.cc
+++ b/libjava/jni.cc
@@ -1784,7 +1784,7 @@ _Jv_JNIMethod::call (ffi_cif *, void *ret, ffi_raw *args, void *__this)
   memcpy (&real_args[offset], args, _this->args_raw_size);
 
   // The actual call to the JNI function.
-  ffi_raw_call (&_this->jni_cif, (void (*) (...)) _this->function,
+  ffi_raw_call (&_this->jni_cif, (void (*)()) _this->function,
 		ret, real_args);
 
   _Jv_JNI_PopSystemFrame (env);