comparison src/share/vm/runtime/atomic.cpp @ 14489:f460c6926af7

Merge
author ehelin
date Tue, 25 Feb 2014 11:02:11 +0100
parents abec000618bf
children 4ca6dc0799b6
comparison
equal deleted inserted replaced
14488:60fd6d24f49f 14489:f460c6926af7
30 #ifdef TARGET_OS_FAMILY_solaris 30 #ifdef TARGET_OS_FAMILY_solaris
31 # include "os_solaris.inline.hpp" 31 # include "os_solaris.inline.hpp"
32 #endif 32 #endif
33 #ifdef TARGET_OS_FAMILY_windows 33 #ifdef TARGET_OS_FAMILY_windows
34 # include "os_windows.inline.hpp" 34 # include "os_windows.inline.hpp"
35 #endif
36 #ifdef TARGET_OS_FAMILY_aix
37 # include "os_aix.inline.hpp"
35 #endif 38 #endif
36 #ifdef TARGET_OS_FAMILY_bsd 39 #ifdef TARGET_OS_FAMILY_bsd
37 # include "os_bsd.inline.hpp" 40 # include "os_bsd.inline.hpp"
38 #endif 41 #endif
39 42