aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Cohen <jeffc@jolt-lang.org>2005-01-06 07:01:08 +0000
committerJeff Cohen <jeffc@jolt-lang.org>2005-01-06 07:01:08 +0000
commite67bc1384aa36841695789f38d2a09942ecf12b6 (patch)
tree802639e365aac28a29583fe43cb7b9b5149bd233
parent00f3db6a4c45c425a570c8496b6f9880b2003a14 (diff)
Get the #ifdef right on LinkAllPasses.h.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@19310 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r--include/llvm/Transforms/LinkAllPasses.h7
-rw-r--r--tools/opt/opt.cpp1
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"