aboutsummaryrefslogtreecommitdiffstats
path: root/lib/Support/Windows/Signals.inc
diff options
context:
space:
mode:
authorStephen Hines <srhines@google.com>2014-04-25 20:47:46 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2014-04-25 20:47:46 +0000
commit37a6adeb1525309c655d8acb341019d475b2a6a5 (patch)
treee6cfb69fbbd937f450eeb83bfb83b9da3b01275a /lib/Support/Windows/Signals.inc
parent69a8640022b04415ae9fac62f8ab090601d8f889 (diff)
parent36b56886974eae4f9c5ebc96befd3e7bfe5de338 (diff)
downloadexternal_llvm-37a6adeb1525309c655d8acb341019d475b2a6a5.tar.gz
external_llvm-37a6adeb1525309c655d8acb341019d475b2a6a5.tar.bz2
external_llvm-37a6adeb1525309c655d8acb341019d475b2a6a5.zip
Merge "Update to LLVM 3.5a."
Diffstat (limited to 'lib/Support/Windows/Signals.inc')
-rw-r--r--lib/Support/Windows/Signals.inc8
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/Support/Windows/Signals.inc b/lib/Support/Windows/Signals.inc
index 4b40d51e5b..35ba6f8e1b 100644
--- a/lib/Support/Windows/Signals.inc
+++ b/lib/Support/Windows/Signals.inc
@@ -12,12 +12,13 @@
//===----------------------------------------------------------------------===//
#include "llvm/Support/FileSystem.h"
-
-#include "Windows.h"
#include <algorithm>
#include <stdio.h>
#include <vector>
+// The Windows.h header must be after LLVM and standard headers.
+#include "WindowsSupport.h"
+
#ifdef __MINGW32__
#include <imagehlp.h>
#else
@@ -317,8 +318,7 @@ static void Cleanup() {
if (FilesToRemove != NULL)
while (!FilesToRemove->empty()) {
- bool Existed;
- llvm::sys::fs::remove(FilesToRemove->back(), Existed);
+ llvm::sys::fs::remove(FilesToRemove->back());
FilesToRemove->pop_back();
}