Mercurial > hg > truffle
comparison src/os/solaris/vm/thread_solaris.inline.hpp @ 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 | ce8f6bb717c9 |
comparison
equal
deleted
inserted
replaced
7163:2ed8d74e5984 | 7212:291ffc492eb6 |
---|---|
22 * | 22 * |
23 */ | 23 */ |
24 | 24 |
25 #ifndef OS_SOLARIS_VM_THREAD_SOLARIS_INLINE_HPP | 25 #ifndef OS_SOLARIS_VM_THREAD_SOLARIS_INLINE_HPP |
26 #define OS_SOLARIS_VM_THREAD_SOLARIS_INLINE_HPP | 26 #define OS_SOLARIS_VM_THREAD_SOLARIS_INLINE_HPP |
27 | |
28 #ifndef SHARE_VM_RUNTIME_THREAD_INLINE_HPP_SCOPE | |
29 #error "This file should only be included from thread.inline.hpp" | |
30 #endif | |
27 | 31 |
28 #include "runtime/atomic.hpp" | 32 #include "runtime/atomic.hpp" |
29 #include "runtime/prefetch.hpp" | 33 #include "runtime/prefetch.hpp" |
30 #include "runtime/thread.hpp" | 34 #include "runtime/thread.hpp" |
31 #include "runtime/threadLocalStorage.hpp" | 35 #include "runtime/threadLocalStorage.hpp" |