comparison src/share/vm/runtime/jniHandles.cpp @ 7212:291ffc492eb6

Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/
author Doug Simon <doug.simon@oracle.com>
date Fri, 14 Dec 2012 14:35:13 +0100
parents f34d701e952e
children 001ec9515f84
comparison
equal deleted inserted replaced
7163:2ed8d74e5984 7212:291ffc492eb6
26 #include "classfile/systemDictionary.hpp" 26 #include "classfile/systemDictionary.hpp"
27 #include "oops/oop.inline.hpp" 27 #include "oops/oop.inline.hpp"
28 #include "prims/jvmtiExport.hpp" 28 #include "prims/jvmtiExport.hpp"
29 #include "runtime/jniHandles.hpp" 29 #include "runtime/jniHandles.hpp"
30 #include "runtime/mutexLocker.hpp" 30 #include "runtime/mutexLocker.hpp"
31 #ifdef TARGET_OS_FAMILY_linux 31 #include "runtime/thread.inline.hpp"
32 # include "thread_linux.inline.hpp"
33 #endif
34 #ifdef TARGET_OS_FAMILY_solaris
35 # include "thread_solaris.inline.hpp"
36 #endif
37 #ifdef TARGET_OS_FAMILY_windows
38 # include "thread_windows.inline.hpp"
39 #endif
40 #ifdef TARGET_OS_FAMILY_bsd
41 # include "thread_bsd.inline.hpp"
42 #endif
43 32
44 33
45 JNIHandleBlock* JNIHandles::_global_handles = NULL; 34 JNIHandleBlock* JNIHandles::_global_handles = NULL;
46 JNIHandleBlock* JNIHandles::_weak_global_handles = NULL; 35 JNIHandleBlock* JNIHandles::_weak_global_handles = NULL;
47 oop JNIHandles::_deleted_handle = NULL; 36 oop JNIHandles::_deleted_handle = NULL;