comparison src/os/solaris/vm/os_solaris.inline.hpp @ 7206:d2f8c38e543d

Merge
author roland
date Fri, 07 Dec 2012 01:09:03 -0800
parents cd3d6a6b95d9
children 203f64878aab
comparison
equal deleted inserted replaced
7191:816b7e5bf2ed 7206:d2f8c38e543d
24 24
25 #ifndef OS_SOLARIS_VM_OS_SOLARIS_INLINE_HPP 25 #ifndef OS_SOLARIS_VM_OS_SOLARIS_INLINE_HPP
26 #define OS_SOLARIS_VM_OS_SOLARIS_INLINE_HPP 26 #define OS_SOLARIS_VM_OS_SOLARIS_INLINE_HPP
27 27
28 #include "runtime/atomic.hpp" 28 #include "runtime/atomic.hpp"
29 #include "runtime/atomic.inline.hpp"
29 #include "runtime/os.hpp" 30 #include "runtime/os.hpp"
31
30 #ifdef TARGET_OS_ARCH_solaris_x86 32 #ifdef TARGET_OS_ARCH_solaris_x86
31 # include "atomic_solaris_x86.inline.hpp"
32 # include "orderAccess_solaris_x86.inline.hpp" 33 # include "orderAccess_solaris_x86.inline.hpp"
33 #endif 34 #endif
34 #ifdef TARGET_OS_ARCH_solaris_sparc 35 #ifdef TARGET_OS_ARCH_solaris_sparc
35 # include "atomic_solaris_sparc.inline.hpp"
36 # include "orderAccess_solaris_sparc.inline.hpp" 36 # include "orderAccess_solaris_sparc.inline.hpp"
37 #endif 37 #endif
38 38
39 // System includes 39 // System includes
40 #include <sys/param.h> 40 #include <sys/param.h>