From e9eda65f4b41f4fcdbcd34faafa410cea931e099 Mon Sep 17 00:00:00 2001 From: Zachary Turner Date: Wed, 17 May 2017 16:39:33 +0000 Subject: [PATCH] Workaround for incorrect Win32 header on GCC. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@303272 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Support/CrashRecoveryContext.cpp | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/lib/Support/CrashRecoveryContext.cpp b/lib/Support/CrashRecoveryContext.cpp index f49630411e5..6ebde46203f 100644 --- a/lib/Support/CrashRecoveryContext.cpp +++ b/lib/Support/CrashRecoveryContext.cpp @@ -164,15 +164,13 @@ CrashRecoveryContext::unregisterCleanup(CrashRecoveryContextCleanup *cleanup) { static LONG CALLBACK ExceptionHandler(PEXCEPTION_POINTERS ExceptionInfo) { -#ifdef DBG_PRINTEXCEPTION_WIDE_C - constexpr ULONG WideDbgPrintValue = DBG_PRINTEXCEPTION_WIDE_C; -#else - constexpr ULONG WideDbgPrintValue = 0x4001000AL; -#endif + // DBG_PRINTEXCEPTION_WIDE_C is not properly defined on all supported + // compilers and platforms, so we define it manually. + constexpr ULONG DbgPrintExceptionWideC = 0x4001000AL; switch (ExceptionInfo->ExceptionRecord->ExceptionCode) { case DBG_PRINTEXCEPTION_C: - case WideDbgPrintValue: + case DbgPrintExceptionWideC: case 0x406D1388: // set debugger thread name return EXCEPTION_CONTINUE_EXECUTION; } -- 2.50.1