projects
/
platform
/
upstream
/
llvm.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
be95b4a
)
Windows: Include <eh.h> instead of declarating __uncaught_exception.
author
Rui Ueyama
<ruiu@google.com>
Fri, 13 Mar 2015 19:52:39 +0000
(19:52 +0000)
committer
Rui Ueyama
<ruiu@google.com>
Fri, 13 Mar 2015 19:52:39 +0000
(19:52 +0000)
llvm-svn: 232204
lld/include/lld/Core/Parallel.h
patch
|
blob
|
history
diff --git
a/lld/include/lld/Core/Parallel.h
b/lld/include/lld/Core/Parallel.h
index
4022746
..
62da40c
100644
(file)
--- a/
lld/include/lld/Core/Parallel.h
+++ b/
lld/include/lld/Core/Parallel.h
@@
-16,8
+16,9
@@
#include "llvm/Support/MathExtras.h"
#ifdef _MSC_VER
-// Exceptions are disabled so this isn't defined, but concrt assumes it is.
-static void *__uncaught_exception() { return nullptr; }
+// concrt.h depends on eh.h for __uncaught_exception declaration
+// even if we disable exceptions.
+#include <eh.h>
#endif
#include <algorithm>