From ed674251587d9dcc99e617713da9a992774d6b73 Mon Sep 17 00:00:00 2001 From: Ulrich Weigand Date: Thu, 14 Oct 2004 20:36:37 +0000 Subject: [PATCH] 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 --- libjava/ChangeLog | 5 +++++ libjava/jni.cc | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 980490d1b067..2a0fa475725c 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,8 @@ +2004-10-14 Ulrich Weigand + + * 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 * interpret.cc (_Jv_InterpMethod::run): Initialize diff --git a/libjava/jni.cc b/libjava/jni.cc index e9e557a3645e..53491cb606d5 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);