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/include | |
| 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/include')
| -rw-r--r-- | libjava/include/posix.h | 12 | ||||
| -rw-r--r-- | libjava/include/win32.h | 16 |
2 files changed, 28 insertions, 0 deletions
diff --git a/libjava/include/posix.h b/libjava/include/posix.h index 0aadd47d3b3..bbec6d1737f 100644 --- a/libjava/include/posix.h +++ b/libjava/include/posix.h @@ -44,6 +44,18 @@ details. */ #define _Jv_platform_solib_prefix "lib" #define _Jv_platform_solib_suffix ".so" +// Separator for file name components. +#define _Jv_platform_file_separator ((jchar) '/') +// Separator for path components. +#define _Jv_platform_path_separator ((jchar) ':') + +// List of names for `JNI_OnLoad'. +#define _Jv_platform_onload_names { "JNI_OnLoad", NULL } + +// Type of libffi ABI used by JNICALL methods. NOTE: This must agree +// with the JNICALL definition in jni.h +#define _Jv_platform_ffi_abi FFI_DEFAULT_ABI + #ifndef DISABLE_JAVA_NET #include <java/net/InetAddress.h> #endif diff --git a/libjava/include/win32.h b/libjava/include/win32.h index 4330c79d397..320273aa4e5 100644 --- a/libjava/include/win32.h +++ b/libjava/include/win32.h @@ -24,6 +24,22 @@ details. */ #define _Jv_platform_solib_prefix "" #define _Jv_platform_solib_suffix ".dll" +// Separator for file name components. +#define _Jv_platform_file_separator ((jchar) '\\') +// Separator for path components. +#define _Jv_platform_path_separator ((jchar) ';') + +// List of names for `JNI_OnLoad'. On Win32, JNI_OnLoad is an +// "stdcall" function taking two pointers (8 bytes) as arguments. It +// could also have been exported as "JNI_OnLoad@8" (MinGW) or +// "_JNI_OnLoad@8" (MSVC). +#define _Jv_platform_onload_names \ + { "JNI_OnLoad", "JNI_OnLoad@8", "_JNI_OnLoad@8", NULL } + +// Type of libffi ABI used by JNICALL methods. NOTE: This must agree +// with the JNICALL definition in jni.h +#define _Jv_platform_ffi_abi FFI_STDCALL + #ifndef DISABLE_JAVA_NET // these errors cannot occur on Win32 |
