Merge vk-gl-cts/vulkan-cts-1.0.1 into vk-gl-cts/vulkan-cts-1.0.2

[platform/upstream/VK-GL-CTS.git] / framework / qphelper / qpCrashHandler.c

diff --git a/framework/qphelper/qpCrashHandler.c b/framework/qphelper/qpCrashHandler.c
index 792ae37..409397f 100644 (file)
--- a/framework/qphelper/qpCrashHandler.c
+++ b/framework/qphelper/qpCrashHandler.c
@@ -33,7 +33,7 @@
 #include <stdarg.h>
 #include <stdlib.h>
 
-#if DE_OS == DE_OS_UNIX
+#if (DE_OS == DE_OS_UNIX)
 #      include <unistd.h>
 #      include <execinfo.h>
 #      include <errno.h>
@@ -137,7 +137,12 @@ static void defaultCrashHandler (qpCrashHandler* crashHandler, void* userPtr)
 
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
+
+/* DbgHelp.h generates C4091 */
+#pragma warning (push)
+#pragma warning (disable: 4091)
 #include <DbgHelp.h>
+#pragma warning (pop)
 
 struct qpCrashHandler_s
 {