Mercurial > hg > truffle
comparison src/os/windows/vm/os_windows.cpp @ 6825:bf2edd3c9b0f
8000102: Resolve include conflicts
Summary: Removing include of c1/c1_runtime.hpp and opto/runtime.hpp from all os-files.
Reviewed-by: kvn
Contributed-by: nils.eliasson@oracle.com
| author | neliasso |
|---|---|
| date | Thu, 04 Oct 2012 06:31:07 -0700 |
| parents | d2a62e0f25eb |
| children | 5ec0c42da025 |
comparison
equal
deleted
inserted
replaced
| 6824:f13867c41f73 | 6825:bf2edd3c9b0f |
|---|---|
| 66 #include "utilities/growableArray.hpp" | 66 #include "utilities/growableArray.hpp" |
| 67 #include "utilities/vmError.hpp" | 67 #include "utilities/vmError.hpp" |
| 68 #ifdef TARGET_ARCH_x86 | 68 #ifdef TARGET_ARCH_x86 |
| 69 # include "assembler_x86.inline.hpp" | 69 # include "assembler_x86.inline.hpp" |
| 70 # include "nativeInst_x86.hpp" | 70 # include "nativeInst_x86.hpp" |
| 71 #endif | |
| 72 #ifdef COMPILER1 | |
| 73 #include "c1/c1_Runtime1.hpp" | |
| 74 #endif | |
| 75 #ifdef COMPILER2 | |
| 76 #include "opto/runtime.hpp" | |
| 77 #endif | 71 #endif |
| 78 | 72 |
| 79 #ifdef _DEBUG | 73 #ifdef _DEBUG |
| 80 #include <crtdbg.h> | 74 #include <crtdbg.h> |
| 81 #endif | 75 #endif |