Mercurial > hg > truffle
comparison src/share/vm/runtime/thread.inline.hpp @ 17812:a7d4d4655766
Merge
author | kvn |
---|---|
date | Wed, 26 Mar 2014 18:21:05 -0700 |
parents | bdd155477289 |
children | 4ca6dc0799b6 ce8f6bb717c9 |
comparison
equal
deleted
inserted
replaced
17789:6b207d038106 | 17812:a7d4d4655766 |
---|---|
35 # include "thread_solaris.inline.hpp" | 35 # include "thread_solaris.inline.hpp" |
36 #endif | 36 #endif |
37 #ifdef TARGET_OS_FAMILY_windows | 37 #ifdef TARGET_OS_FAMILY_windows |
38 # include "thread_windows.inline.hpp" | 38 # include "thread_windows.inline.hpp" |
39 #endif | 39 #endif |
40 #ifdef TARGET_OS_FAMILY_aix | |
41 # include "thread_aix.inline.hpp" | |
42 #endif | |
40 #ifdef TARGET_OS_FAMILY_bsd | 43 #ifdef TARGET_OS_FAMILY_bsd |
41 # include "thread_bsd.inline.hpp" | 44 # include "thread_bsd.inline.hpp" |
42 #endif | 45 #endif |
43 | 46 |
44 #undef SHARE_VM_RUNTIME_THREAD_INLINE_HPP_SCOPE | 47 #undef SHARE_VM_RUNTIME_THREAD_INLINE_HPP_SCOPE |