[lld] r232204 - Windows: Include <eh.h> instead of declarating __uncaught_exception.

[Rui Ueyama]

Author: ruiu
Date: Fri Mar 13 14:52:39 2015
New Revision: 232204

URL: http://llvm.org/viewvc/llvm-project?rev=232204&view=rev
Log:
Windows: Include <eh.h> instead of declarating __uncaught_exception.

Modified:
    lld/trunk/include/lld/Core/Parallel.h

Modified: lld/trunk/include/lld/Core/Parallel.h
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/include/lld/Core/Parallel.h?rev=232204&r1=232203&r2=232204&view=diff
==============================================================================
--- lld/trunk/include/lld/Core/Parallel.h (original)
+++ lld/trunk/include/lld/Core/Parallel.h Fri Mar 13 14:52:39 2015
@@ -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>