diff options
| author | Rui Ueyama <ruiu@google.com> | 2015-03-13 19:52:39 +0000 |
|---|---|---|
| committer | Rui Ueyama <ruiu@google.com> | 2015-03-13 19:52:39 +0000 |
| commit | 65c17046046f2dcb4bc47fc83392bec7bf116f17 (patch) | |
| tree | 6c61f4f2208578e1dee5418b57e334c49252c7ed | |
| parent | be95b4afc6d073677858f0751b74ab8917f5ae34 (diff) | |
| download | bcm5719-llvm-65c17046046f2dcb4bc47fc83392bec7bf116f17.tar.gz bcm5719-llvm-65c17046046f2dcb4bc47fc83392bec7bf116f17.zip | |
Windows: Include <eh.h> instead of declarating __uncaught_exception.
llvm-svn: 232204
| -rw-r--r-- | lld/include/lld/Core/Parallel.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lld/include/lld/Core/Parallel.h b/lld/include/lld/Core/Parallel.h index 4022746389d..62da40c9ba8 100644 --- 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> |
