comparison src/os/windows/vm/os_windows.inline.hpp @ 8883:b9a918201d47

Merge with hsx25
author Gilles Duboscq <duboscq@ssw.jku.at>
date Sat, 06 Apr 2013 20:04:06 +0200
parents 63e54c37ac64
children 59b052799158
comparison
equal deleted inserted replaced
8660:d47b52b0ff68 8883:b9a918201d47
23 */ 23 */
24 24
25 #ifndef OS_WINDOWS_VM_OS_WINDOWS_INLINE_HPP 25 #ifndef OS_WINDOWS_VM_OS_WINDOWS_INLINE_HPP
26 #define OS_WINDOWS_VM_OS_WINDOWS_INLINE_HPP 26 #define OS_WINDOWS_VM_OS_WINDOWS_INLINE_HPP
27 27
28 #include "runtime/atomic.hpp"
29 #include "runtime/atomic.inline.hpp" 28 #include "runtime/atomic.inline.hpp"
30 #include "runtime/os.hpp" 29 #include "runtime/os.hpp"
31 30
32 #ifdef TARGET_OS_ARCH_windows_x86 31 #ifdef TARGET_OS_ARCH_windows_x86
33 # include "orderAccess_windows_x86.inline.hpp" 32 # include "orderAccess_windows_x86.inline.hpp"