OpenJDK / jdk / jdk
changeset 24356:25532c198c59
8034094: SA agent can't compile when jni_x86.h is used
Reviewed-by: dsamersoff, erikj
| author | ehelin |
|---|---|
| date | Wed, 19 Mar 2014 17:04:28 +0100 |
| parents | fee626d3bc01 |
| children | 866567b4cb76 901aa0dcba08 |
| files | hotspot/src/cpu/x86/vm/jni_x86.h |
| diffstat | 1 files changed, 7 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/hotspot/src/cpu/x86/vm/jni_x86.h Tue May 06 09:41:04 2014 +0200 +++ b/hotspot/src/cpu/x86/vm/jni_x86.h Wed Mar 19 17:04:28 2014 +0100 @@ -26,8 +26,14 @@ #ifndef _JAVASOFT_JNI_MD_H_ #define _JAVASOFT_JNI_MD_H_ -#if defined(SOLARIS) || defined(LINUX) || defined(_ALLBSD_SOURCE) +#if defined(_WIN32) + #define JNIEXPORT __declspec(dllexport) + #define JNIIMPORT __declspec(dllimport) + #define JNICALL __stdcall + typedef int jint; + typedef __int64 jlong; +#else // Note: please do not change these without also changing jni_md.h in the JDK // repository @@ -50,13 +56,6 @@ typedef long long jlong; #endif -#else - #define JNIEXPORT __declspec(dllexport) - #define JNIIMPORT __declspec(dllimport) - #define JNICALL __stdcall - - typedef int jint; - typedef __int64 jlong; #endif typedef signed char jbyte;