jni.cc (_Jv_JNIMethod::call): Use ffi_java_raw_call instead of ffi_raw_call if FFI_NA...

	* 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

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 980490d1b06710f963d5d875d5aa5d16eae5edb6..2a0fa475725c2a85d2f1ba0f632bd880307f13db 100644 (file)
--- 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 e9e557a3645ec7b2de53edad4808696858a6a83f..53491cb606d5ba91e39fb8373492d8710253c0fa 100644 (file)
--- 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);