summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeff Cohen <jeffc@jolt-lang.org>2007-05-03 22:09:21 +0000
committerJeff Cohen <jeffc@jolt-lang.org>2007-05-03 22:09:21 +0000
commitee7bf7634205f641668fc8be7ebbc23f962f667f (patch)
tree8f2ce1ae0859a56b2aca65b171b0fc85abf0a432
parent9f600c5d9d7d84b7e9ff9c34a77801587d5f84b9 (diff)
downloadbcm5719-llvm-ee7bf7634205f641668fc8be7ebbc23f962f667f.tar.gz
bcm5719-llvm-ee7bf7634205f641668fc8be7ebbc23f962f667f.zip
Unbreak VC++ build.
llvm-svn: 36700
-rw-r--r--llvm/include/llvm/Pass.h1
-rw-r--r--llvm/lib/VMCore/Globals.cpp4
2 files changed, 2 insertions, 3 deletions
diff --git a/llvm/include/llvm/Pass.h b/llvm/include/llvm/Pass.h
index d678df6430b..b5c9f8d8acf 100644
--- a/llvm/include/llvm/Pass.h
+++ b/llvm/include/llvm/Pass.h
@@ -35,7 +35,6 @@
#include <map>
#include <iosfwd>
#include <cassert>
-#include <stdint.h>
namespace llvm {
diff --git a/llvm/lib/VMCore/Globals.cpp b/llvm/lib/VMCore/Globals.cpp
index 41a9adda079..021d6bf8012 100644
--- a/llvm/lib/VMCore/Globals.cpp
+++ b/llvm/lib/VMCore/Globals.cpp
@@ -223,7 +223,7 @@ const GlobalValue *GlobalAlias::getAliasedGlobal() const {
else
assert(0 && "Unsupported aliasee");
}
- } else
- return 0;
+ }
+ return 0;
}
OpenPOWER on IntegriCloud