Patch: build fixes

[Bryce McKinlay <bryce at albatross dot co dot nz>]

I'm going to check in Alex's build fix, with one variation: in
interpret.cc I think it is cleaner to fix the offending declaration
rather than cast back and forth.

Also, java/awt/Button.java seems to be missing from the Makefile, so I'm
adding that as well.

Hans informs me that a new gc version should be out shortly and will
have complete prototypes for all its header functions. I'll try to
import it ASAP once he releases it, and then we should be able to build
again. For now, a slightly older compiler is still required.

regards

  [ bryce ]

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.

Index: interpret.cc
===================================================================
RCS file: /cvs/java/libgcj/libjava/interpret.cc,v
retrieving revision 1.18
diff -u -r1.18 interpret.cc
--- interpret.cc	2000/07/28 13:11:45	1.18
+++ interpret.cc	2000/08/02 03:14:06
@@ -406,7 +406,7 @@
   _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 @@
 	  {
 	    // 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 @@
 
 	NULLCHECK(sp[0]);
 
-	fun = (void (*) (...))rmeth->method->ncode;
+	fun = (void (*)()) rmeth->method->ncode;
       }
       goto perform_invoke;
 
@@ -2163,7 +2163,7 @@
 	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 @@
 
 	jobject rcv = sp[0].o;
 
-	fun = (void (*) (...))
+	fun = (void (*)())
 	  _Jv_LookupInterfaceMethod (rcv->getClass (),
 				     rmeth->method->name,
 				     rmeth->method->signature);
Index: jni.cc
===================================================================
RCS file: /cvs/java/libgcj/libjava/jni.cc,v
retrieving revision 1.31
diff -u -r1.31 jni.cc
--- jni.cc	2000/04/20 17:39:30	1.31
+++ jni.cc	2000/08/02 03:14:12
@@ -1784,7 +1784,7 @@
   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);
Index: Makefile.am
===================================================================
RCS file: /cvs/java/libgcj/libjava/Makefile.am,v
retrieving revision 1.72
diff -u -r1.72 Makefile.am
--- Makefile.am	2000/07/25 17:53:27	1.72
+++ Makefile.am	2000/08/02 03:14:17
@@ -494,6 +494,7 @@
 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 \
Index: java/lang/reflect/natMethod.cc
===================================================================
RCS file: /cvs/java/libgcj/libjava/java/lang/reflect/natMethod.cc,v
retrieving revision 1.12
diff -u -r1.12 natMethod.cc
--- natMethod.cc	2000/07/27 23:57:06	1.12
+++ natMethod.cc	2000/08/02 03:14:17
@@ -414,7 +414,7 @@
 
   try
     {
-      ffi_call (&cif, (void (*) (...)) meth->ncode, result, values);
+      ffi_call (&cif, (void (*)()) meth->ncode, result, values);
     }
   catch (Throwable *ex2)
     {