comparison src/share/vm/runtime/atomic.cpp @ 18058:54bc75c144b0

Merge
author asaha
date Thu, 29 May 2014 13:14:25 -0700
parents a9becfeecd1b
children 4ca6dc0799b6
comparison
equal deleted inserted replaced
18055:1fa005fb28f5 18058:54bc75c144b0
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