diff options
| author | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2003-03-17 00:45:37 +0000 |
|---|---|---|
| committer | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2003-03-17 00:45:37 +0000 |
| commit | a268033c73e99bd85a90207cef64c18e7dc8c6e7 (patch) | |
| tree | 9c8375299ef6ce318b2eb397da5d0658a1f7d5e7 /libjava/resolve.cc | |
| parent | 84d6ec25a4dcbf7c85fa1d01cb2161a36cf0f84b (diff) | |
| download | ppe42-gcc-a268033c73e99bd85a90207cef64c18e7dc8c6e7.tar.gz ppe42-gcc-a268033c73e99bd85a90207cef64c18e7dc8c6e7.zip | |
* resolve.cc (ncode): Use _Jv_platform_ffi_abi.
Include platform.h.
* java/lang/natRuntime.cc (insertSystemProperties): Use
_Jv_platform_path_separator.
(nativeGetLibname): Use _Jv_platform_file_separator.
(_load): Use _Jv_platform_onload_names.
(onload_names): New global.
* include/win32.h (_Jv_platform_file_separator): New define.
(_Jv_platform_path_separator): Likewise.
(_Jv_platform_onload_names): Likewise.
(_Jv_platform_ffi_abi): Likewise.
* include/posix.h (_Jv_platform_file_separator): New define.
(_Jv_platform_path_separator): Likewise.
(_Jv_platform_onload_names): Likewise.
(_Jv_platform_ffi_abi): Likewise.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@64461 138bc75d-0d04-0410-961f-82ee72b054a4
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 aa17ea9c5f0..ea506452d58 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"); |
