comparison src/os/linux/vm/jvm_linux.h @ 4970:33df1aeaebbf

Merge with http://hg.openjdk.java.net/hsx/hsx24/hotspot/
author Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
date Mon, 27 Feb 2012 13:10:13 +0100
parents 11c26bfcf8c7
children
comparison
equal deleted inserted replaced
4703:2cfb7fb2dce7 4970:33df1aeaebbf
31 // This is derived from the JDK classic file: 31 // This is derived from the JDK classic file:
32 // "$JDK/src/solaris/javavm/export/jvm_md.h":15 (ver. 1.10 98/04/22) 32 // "$JDK/src/solaris/javavm/export/jvm_md.h":15 (ver. 1.10 98/04/22)
33 // All local includes have been commented out. 33 // All local includes have been commented out.
34 */ 34 */
35 35
36
37 #ifndef JVM_MD_H 36 #ifndef JVM_MD_H
38 #define JVM_MD_H 37 #define JVM_MD_H
39 38
40 /* 39 /*
41 * This file is currently collecting system-specific dregs for the 40 * This file is currently collecting system-specific dregs for the
42 * JNI conversion, which should be sorted out later. 41 * JNI conversion, which should be sorted out later.
43 */ 42 */
44 43
45 #include <dirent.h> /* For DIR */ 44 #include <dirent.h> /* For DIR */
46 #include <sys/param.h> /* For MAXPATHLEN */ 45 #include <sys/param.h> /* For MAXPATHLEN */
46 #include <sys/socket.h> /* For socklen_t */
47 #include <unistd.h> /* For F_OK, R_OK, W_OK */ 47 #include <unistd.h> /* For F_OK, R_OK, W_OK */
48 48
49 #define JNI_ONLOAD_SYMBOLS {"JNI_OnLoad"} 49 #define JNI_ONLOAD_SYMBOLS {"JNI_OnLoad"}
50 #define JNI_ONUNLOAD_SYMBOLS {"JNI_OnUnload"} 50 #define JNI_ONUNLOAD_SYMBOLS {"JNI_OnUnload"}
51 #define JVM_ONLOAD_SYMBOLS {"JVM_OnLoad"} 51 #define JVM_ONLOAD_SYMBOLS {"JVM_OnLoad"}
93 #define SHUTDOWN2_SIGNAL SIGINT 93 #define SHUTDOWN2_SIGNAL SIGINT
94 #define SHUTDOWN3_SIGNAL SIGTERM 94 #define SHUTDOWN3_SIGNAL SIGTERM
95 95
96 #endif /* JVM_MD_H */ 96 #endif /* JVM_MD_H */
97 97
98 // Reconciliation History
99 // jvm_solaris.h 1.6 99/06/22 16:38:47
100 // End
101
102 #endif // OS_LINUX_VM_JVM_LINUX_H 98 #endif // OS_LINUX_VM_JVM_LINUX_H