comparison src/share/vm/runtime/atomic.cpp @ 18041:52b4284cb496

Merge with jdk8u20-b26
author Gilles Duboscq <duboscq@ssw.jku.at>
date Wed, 15 Oct 2014 16:02:50 +0200
parents 89152779163c
children
comparison
equal deleted inserted replaced
17606:45d7b2c7029d 18041:52b4284cb496
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