Mercurial > hg > graal-compiler
diff src/os_cpu/windows_x86/vm/os_windows_x86.cpp @ 7212:291ffc492eb6
Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/
| author | Doug Simon <doug.simon@oracle.com> |
|---|---|
| date | Fri, 14 Dec 2012 14:35:13 +0100 |
| parents | e522a00b91aa d2f8c38e543d |
| children | 5fc51c1ecdeb |
line wrap: on
line diff
--- a/src/os_cpu/windows_x86/vm/os_windows_x86.cpp Fri Dec 14 10:20:54 2012 +0100 +++ b/src/os_cpu/windows_x86/vm/os_windows_x86.cpp Fri Dec 14 14:35:13 2012 +0100 @@ -23,7 +23,7 @@ */ // no precompiled headers -#include "assembler_x86.inline.hpp" +#include "asm/macroAssembler.hpp" #include "classfile/classLoader.hpp" #include "classfile/systemDictionary.hpp" #include "classfile/vmSymbols.hpp" @@ -48,8 +48,8 @@ #include "runtime/osThread.hpp" #include "runtime/sharedRuntime.hpp" #include "runtime/stubRoutines.hpp" +#include "runtime/thread.inline.hpp" #include "runtime/timer.hpp" -#include "thread_windows.inline.hpp" #include "utilities/events.hpp" #include "utilities/vmError.hpp"