diff options
| author | Bryce McKinlay <bryce@gcc.gnu.org> | 2000-08-02 04:25:13 +0100 |
|---|---|---|
| committer | Bryce McKinlay <bryce@gcc.gnu.org> | 2000-08-02 04:25:13 +0100 |
| commit | 79c2c6da2c5621208eec12f608b672856d38f6a3 (patch) | |
| tree | 556ab79d201319b851c2f2d9e51c1aa93043fd03 /libjava/interpret.cc | |
| parent | cb7c7fc50e8683bf42be3beac8dbaeca3f00a76b (diff) | |
| download | gcc-79c2c6da2c5621208eec12f608b672856d38f6a3.zip gcc-79c2c6da2c5621208eec12f608b672856d38f6a3.tar.gz gcc-79c2c6da2c5621208eec12f608b672856d38f6a3.tar.bz2 | |
[multiple changes]
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.
From-SVN: r35418
Diffstat (limited to 'libjava/interpret.cc')
| -rw-r--r-- | libjava/interpret.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libjava/interpret.cc b/libjava/interpret.cc index 069abdb..d6368d5 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); |