Get the #ifdef right on LinkAllPasses.h.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@19310 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/include/llvm/Transforms/LinkAllPasses.h b/include/llvm/Transforms/LinkAllPasses.h
index aba858a46afc53c928ea3b10df092273f9ab5cb0..f0d076cb69d99d3ccc1b50ea38307aece3b4e049 100644 (file)
--- 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 2ae357c394432f9531056cbf22178502bea51f36..fd339d92d98d91ecc49ef7c6553a2c0b3a3ea61c 100644 (file)
--- 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"