comparison src/os/windows/vm/jvm_windows.h @ 6275:957c266d8bc5

Merge with http://hg.openjdk.java.net/hsx/hsx24/hotspot/
author Doug Simon <doug.simon@oracle.com>
date Tue, 21 Aug 2012 10:39:19 +0200
parents ec15e8f6e4f1
children ba8fd2fe198b
comparison
equal deleted inserted replaced
5891:fd8832ae511d 6275:957c266d8bc5
57 #include <Psapi.h> 57 #include <Psapi.h>
58 #endif 58 #endif
59 59
60 #include <Tlhelp32.h> 60 #include <Tlhelp32.h>
61 61
62 typedef unsigned int socklen_t; 62 typedef int socklen_t;
63 63
64 // #include "jni.h" 64 // #include "jni.h"
65 65
66 #define JNI_ONLOAD_SYMBOLS {"_JNI_OnLoad@8", "JNI_OnLoad"} 66 #define JNI_ONLOAD_SYMBOLS {"_JNI_OnLoad@8", "JNI_OnLoad"}
67 #define JNI_ONUNLOAD_SYMBOLS {"_JNI_OnUnload@8", "JNI_OnUnload"} 67 #define JNI_ONUNLOAD_SYMBOLS {"_JNI_OnUnload@8", "JNI_OnUnload"}