diff options
| -rw-r--r-- | include/llvm/Transforms/LinkAllPasses.h | 7 | ||||
| -rw-r--r-- | tools/opt/opt.cpp | 1 |
2 files changed, 4 insertions, 4 deletions
diff --git a/include/llvm/Transforms/LinkAllPasses.h b/include/llvm/Transforms/LinkAllPasses.h index aba858a46a..f0d076cb69 100644 --- a/include/llvm/Transforms/LinkAllPasses.h +++ b/include/llvm/Transforms/LinkAllPasses.h @@ -16,14 +16,15 @@ #ifndef LLVM_TRANSFORMS_LINKALLPASSES_H #define LLVM_TRANSFORMS_LINKALLPASSES_H -#ifdef LLVM_ON_WIN32 +#ifdef _MSC_VER #include "llvm/Transforms/Instrumentation.h" #include "llvm/Transforms/IPO.h" #include "llvm/Transforms/Scalar.h" #include "llvm/Transforms/Utils/UnifyFunctionExitNodes.h" -// Trying not to include <windows.h>, though maybe we should... +// Trying not to include <windows.h>, though maybe we should... Problem is, +// it pollutes the global namespace in some really nasty ways. extern "C" __declspec(dllimport) void* __stdcall GetCurrentProcess(); namespace { @@ -107,6 +108,6 @@ namespace { } X; }; -#endif // LLVM_ON_WIN32 +#endif // _MSC_VER #endif diff --git a/tools/opt/opt.cpp b/tools/opt/opt.cpp index 2ae357c394..fd339d92d9 100644 --- a/tools/opt/opt.cpp +++ b/tools/opt/opt.cpp @@ -12,7 +12,6 @@ // //===----------------------------------------------------------------------===// -#include "llvm/Config/config.h" #include "llvm/Module.h" #include "llvm/PassManager.h" #include "llvm/Bytecode/Reader.h" |