Mercurial > hg > truffle

comparison src/os/windows/vm/os_windows.inline.hpp @ 20804:7848fc12602b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
comparison
equal deleted inserted replaced
20184:84105dcdb05b 20804:7848fc12602b
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.inline.hpp" 28 #include "runtime/atomic.inline.hpp"
29 #include "runtime/orderAccess.inline.hpp"
29 #include "runtime/os.hpp" 30 #include "runtime/os.hpp"
30
31 #ifdef TARGET_OS_ARCH_windows_x86
32 # include "orderAccess_windows_x86.inline.hpp"
33 #endif
34 31
35 inline const char* os::file_separator() { return "\\"; } 32 inline const char* os::file_separator() { return "\\"; }
36 inline const char* os::line_separator() { return "\r\n"; } 33 inline const char* os::line_separator() { return "\r\n"; }
37 inline const char* os::path_separator() { return ";"; } 34 inline const char* os::path_separator() { return ";"; }
38 inline const char* os::dll_file_extension() { return ".dll"; } 35 inline const char* os::dll_file_extension() { return ".dll"; }