Mercurial > hg > truffle
diff src/os/windows/vm/os_windows.inline.hpp @ 20804:7848fc12602b
Merge with jdk8u40-b25
| author | Gilles Duboscq <gilles.m.duboscq@oracle.com> |
|---|---|
| date | Tue, 07 Apr 2015 14:58:49 +0200 |
| parents | 52b4284cb496 ce8f6bb717c9 |
| children |
line wrap: on
line diff
--- a/src/os/windows/vm/os_windows.inline.hpp Tue Apr 07 11:20:51 2015 +0200 +++ b/src/os/windows/vm/os_windows.inline.hpp Tue Apr 07 14:58:49 2015 +0200 @@ -26,12 +26,9 @@ #define OS_WINDOWS_VM_OS_WINDOWS_INLINE_HPP #include "runtime/atomic.inline.hpp" +#include "runtime/orderAccess.inline.hpp" #include "runtime/os.hpp" -#ifdef TARGET_OS_ARCH_windows_x86 -# include "orderAccess_windows_x86.inline.hpp" -#endif - inline const char* os::file_separator() { return "\\"; } inline const char* os::line_separator() { return "\r\n"; } inline const char* os::path_separator() { return ";"; }