From 712323ab7c0893bd505a56099a7353baa044c59b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Ho=C5=99e=C5=88ovsk=C3=BD?= Date: Fri, 3 Feb 2017 14:09:17 +0100 Subject: [PATCH] Include windows.h proxy header, instead of windows.h itself Because the signal changes were in a different branch from the windows.h related changes, the SEH handling code included the header directly. Fixes #803 --- include/internal/catch_fatal_condition.hpp | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/include/internal/catch_fatal_condition.hpp b/include/internal/catch_fatal_condition.hpp index b9f8c694..29021a39 100644 --- a/include/internal/catch_fatal_condition.hpp +++ b/include/internal/catch_fatal_condition.hpp @@ -23,11 +23,8 @@ namespace Catch { #if defined ( CATCH_PLATFORM_WINDOWS ) ///////////////////////////////////////// -#define NOMINMAX -#define WIN32_LEAN_AND_MEAN -#include -#undef WIN32_LEAN_AND_MEAN -#undef NOMINMAX + +#include "catch_windows_h_proxy.h" namespace Catch {