Mercurial > hg > graal-jvmci-8
diff src/share/vm/runtime/jniHandles.cpp @ 7182:c24f778e9401
Merge
| author | johnc |
|---|---|
| date | Thu, 29 Nov 2012 11:23:15 -0800 |
| parents | f34d701e952e |
| children | 001ec9515f84 |
line wrap: on
line diff
--- a/src/share/vm/runtime/jniHandles.cpp Wed Nov 28 17:50:21 2012 -0500 +++ b/src/share/vm/runtime/jniHandles.cpp Thu Nov 29 11:23:15 2012 -0800 @@ -28,18 +28,7 @@ #include "prims/jvmtiExport.hpp" #include "runtime/jniHandles.hpp" #include "runtime/mutexLocker.hpp" -#ifdef TARGET_OS_FAMILY_linux -# include "thread_linux.inline.hpp" -#endif -#ifdef TARGET_OS_FAMILY_solaris -# include "thread_solaris.inline.hpp" -#endif -#ifdef TARGET_OS_FAMILY_windows -# include "thread_windows.inline.hpp" -#endif -#ifdef TARGET_OS_FAMILY_bsd -# include "thread_bsd.inline.hpp" -#endif +#include "runtime/thread.inline.hpp" JNIHandleBlock* JNIHandles::_global_handles = NULL;