diff options
| author | Ulrich Weigand <uweigand@de.ibm.com> | 2004-10-14 20:36:37 +0000 |
|---|---|---|
| committer | Ulrich Weigand <uweigand@gcc.gnu.org> | 2004-10-14 20:36:37 +0000 |
| commit | ed674251587d9dcc99e617713da9a992774d6b73 (patch) | |
| tree | 0235c0a5bba4955b789d205a50a61eb9827815b2 | |
| parent | b419bac76437541dd7887158f0d231dfc2aa4f90 (diff) | |
| download | gcc-ed674251587d9dcc99e617713da9a992774d6b73.zip gcc-ed674251587d9dcc99e617713da9a992774d6b73.tar.gz gcc-ed674251587d9dcc99e617713da9a992774d6b73.tar.bz2 | |
jni.cc (_Jv_JNIMethod::call): Use ffi_java_raw_call instead of ffi_raw_call if FFI_NATIVE_RAW_API is not defined.
* jni.cc (_Jv_JNIMethod::call): Use ffi_java_raw_call instead of
ffi_raw_call if FFI_NATIVE_RAW_API is not defined.
From-SVN: r89051
| -rw-r--r-- | libjava/ChangeLog | 5 | ||||
| -rw-r--r-- | libjava/jni.cc | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 980490d..2a0fa47 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,8 @@ +2004-10-14 Ulrich Weigand <uweigand@de.ibm.com> + + * jni.cc (_Jv_JNIMethod::call): Use ffi_java_raw_call instead of + ffi_raw_call if FFI_NATIVE_RAW_API is not defined. + 2004-10-13 Andrew Haley <aph@redhat.com> * interpret.cc (_Jv_InterpMethod::run): Initialize diff --git a/libjava/jni.cc b/libjava/jni.cc index e9e557a..53491cb 100644 --- a/libjava/jni.cc +++ b/libjava/jni.cc @@ -2213,8 +2213,13 @@ _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. +#if FFI_NATIVE_RAW_API ffi_raw_call (&_this->jni_cif, (void (*)()) _this->function, ret, real_args); +#else + ffi_java_raw_call (&_this->jni_cif, (void (*)()) _this->function, + ret, real_args); +#endif if (sync != NULL) _Jv_MonitorExit (sync); |