Mercurial > hg > truffle
comparison src/share/vm/runtime/mutexLocker.hpp @ 14460:8a9bb7821e28
Merge
author | kvn |
---|---|
date | Wed, 19 Feb 2014 12:08:49 -0800 |
parents | 63a4eb8bcd23 2b8e28fdf503 |
children | d8041d695d19 |
comparison
equal
deleted
inserted
replaced
14360:e8ef156f0bc9 | 14460:8a9bb7821e28 |
---|---|
33 #ifdef TARGET_OS_FAMILY_solaris | 33 #ifdef TARGET_OS_FAMILY_solaris |
34 # include "os_solaris.inline.hpp" | 34 # include "os_solaris.inline.hpp" |
35 #endif | 35 #endif |
36 #ifdef TARGET_OS_FAMILY_windows | 36 #ifdef TARGET_OS_FAMILY_windows |
37 # include "os_windows.inline.hpp" | 37 # include "os_windows.inline.hpp" |
38 #endif | |
39 #ifdef TARGET_OS_FAMILY_aix | |
40 # include "os_aix.inline.hpp" | |
38 #endif | 41 #endif |
39 #ifdef TARGET_OS_FAMILY_bsd | 42 #ifdef TARGET_OS_FAMILY_bsd |
40 # include "os_bsd.inline.hpp" | 43 # include "os_bsd.inline.hpp" |
41 #endif | 44 #endif |
42 | 45 |