Mercurial > hg > truffle
comparison src/share/vm/oops/markOop.cpp @ 4137:04b9a2566eec
Merge with hsx23/hotspot.
author | Thomas Wuerthinger <thomas.wuerthinger@oracle.com> |
---|---|
date | Sat, 17 Dec 2011 21:40:27 +0100 |
parents | f08d439fab8c |
children | da91efe96a93 |
comparison
equal
deleted
inserted
replaced
3737:9dc19b7d89a3 | 4137:04b9a2566eec |
---|---|
30 #ifdef TARGET_OS_FAMILY_solaris | 30 #ifdef TARGET_OS_FAMILY_solaris |
31 # include "thread_solaris.inline.hpp" | 31 # include "thread_solaris.inline.hpp" |
32 #endif | 32 #endif |
33 #ifdef TARGET_OS_FAMILY_windows | 33 #ifdef TARGET_OS_FAMILY_windows |
34 # include "thread_windows.inline.hpp" | 34 # include "thread_windows.inline.hpp" |
35 #endif | |
36 #ifdef TARGET_OS_FAMILY_bsd | |
37 # include "thread_bsd.inline.hpp" | |
35 #endif | 38 #endif |
36 | 39 |
37 | 40 |
38 void markOopDesc::print_on(outputStream* st) const { | 41 void markOopDesc::print_on(outputStream* st) const { |
39 if (is_locked()) { | 42 if (is_locked()) { |