Mercurial > hg > truffle
diff src/share/vm/oops/oop.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 | b632e80fc9dc |
line wrap: on
line diff
--- a/src/share/vm/oops/oop.cpp Sat Dec 17 20:50:09 2011 +0100 +++ b/src/share/vm/oops/oop.cpp Sat Dec 17 21:40:27 2011 +0100 @@ -36,6 +36,9 @@ #ifdef TARGET_OS_FAMILY_windows # include "thread_windows.inline.hpp" #endif +#ifdef TARGET_OS_FAMILY_bsd +# include "thread_bsd.inline.hpp" +#endif bool always_do_update_barrier = false;