Mercurial > hg > truffle
comparison src/os/windows/vm/jvm_windows.h @ 4988:eb5b24d1499f
Merge
author | Christian Haeubl <christian.haeubl@oracle.com> |
---|---|
date | Mon, 27 Feb 2012 15:06:36 -0800 |
parents | 11c26bfcf8c7 |
children | ec15e8f6e4f1 |
comparison
equal
deleted
inserted
replaced
4987:f292f9c590ba | 4988:eb5b24d1499f |
---|---|
19 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA | 19 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
20 * or visit www.oracle.com if you need additional information or have any | 20 * or visit www.oracle.com if you need additional information or have any |
21 * questions. | 21 * questions. |
22 * | 22 * |
23 */ | 23 */ |
24 | |
25 #ifndef OS_WINDOWS_VM_JVM_WINDOWS_H | |
26 #define OS_WINDOWS_VM_JVM_WINDOWS_H | |
24 | 27 |
25 #ifndef _JAVASOFT_JVM_MD_H_ | 28 #ifndef _JAVASOFT_JVM_MD_H_ |
26 #define _JAVASOFT_JVM_MD_H_ | 29 #define _JAVASOFT_JVM_MD_H_ |
27 | 30 |
28 /* | 31 /* |
52 | 55 |
53 #else | 56 #else |
54 #include <Psapi.h> | 57 #include <Psapi.h> |
55 #endif | 58 #endif |
56 | 59 |
60 #include <Tlhelp32.h> | |
57 | 61 |
58 | 62 typedef unsigned int socklen_t; |
59 #include <Tlhelp32.h> | |
60 | 63 |
61 // #include "jni.h" | 64 // #include "jni.h" |
62 | 65 |
63 #define JNI_ONLOAD_SYMBOLS {"_JNI_OnLoad@8", "JNI_OnLoad"} | 66 #define JNI_ONLOAD_SYMBOLS {"_JNI_OnLoad@8", "JNI_OnLoad"} |
64 #define JNI_ONUNLOAD_SYMBOLS {"_JNI_OnUnload@8", "JNI_OnUnload"} | 67 #define JNI_ONUNLOAD_SYMBOLS {"_JNI_OnUnload@8", "JNI_OnUnload"} |
127 | 130 |
128 #define SHUTDOWN1_SIGNAL SIGINT /* Shutdown Hooks support. */ | 131 #define SHUTDOWN1_SIGNAL SIGINT /* Shutdown Hooks support. */ |
129 #define SHUTDOWN2_SIGNAL SIGTERM | 132 #define SHUTDOWN2_SIGNAL SIGTERM |
130 | 133 |
131 #endif /* !_JAVASOFT_JVM_MD_H_ */ | 134 #endif /* !_JAVASOFT_JVM_MD_H_ */ |
135 | |
136 #endif // OS_WINDOWS_VM_JVM_WINDOWS_H |