diff options
Diffstat (limited to 'libjava/resolve.cc')
| -rw-r--r-- | libjava/resolve.cc | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/libjava/resolve.cc b/libjava/resolve.cc index aa17ea9..ea50645 100644 --- a/libjava/resolve.cc +++ b/libjava/resolve.cc @@ -11,6 +11,7 @@ details. */ /* Author: Kresten Krab Thorup <krab@gnu.org> */ #include <config.h> +#include <platform.h> #include <java-interp.h> @@ -1003,14 +1004,7 @@ _Jv_JNIMethod::ncode () memcpy (&jni_arg_types[offset], &closure->arg_types[0], arg_count * sizeof (ffi_type *)); - // NOTE: This must agree with the JNICALL definition in jni.h -#ifdef WIN32 -#define FFI_JNI_ABI FFI_STDCALL -#else -#define FFI_JNI_ABI FFI_DEFAULT_ABI -#endif - - if (ffi_prep_cif (&jni_cif, FFI_JNI_ABI, + if (ffi_prep_cif (&jni_cif, _Jv_platform_ffi_abi, extra_args + arg_count, rtype, jni_arg_types) != FFI_OK) throw_internal_error ("ffi_prep_cif failed for JNI function"); |