comparison src/share/vm/runtime/thread.inline.hpp @ 18041:52b4284cb496

Merge with jdk8u20-b26
author Gilles Duboscq <duboscq@ssw.jku.at>
date Wed, 15 Oct 2014 16:02:50 +0200
parents 4ca6dc0799b6
children 7848fc12602b
comparison
equal deleted inserted replaced
17606:45d7b2c7029d 18041:52b4284cb496
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