From 927f520a9731d5a10ec1a16deb15759ee6609528 Mon Sep 17 00:00:00 2001 From: Phil Nash Date: Thu, 12 Oct 2017 10:37:03 +0100 Subject: [PATCH] Moved windows proxy inclusion outside of CATCH_CONFIG_COLOUR_WINDOWS guard, so workaround early inclusion can be removed --- include/catch.hpp | 1 - include/internal/catch_console_colour.cpp | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/include/catch.hpp b/include/catch.hpp index edb588d1..118337c9 100644 --- a/include/catch.hpp +++ b/include/catch.hpp @@ -62,7 +62,6 @@ #endif #ifdef CATCH_IMPL -#include "internal/catch_windows_h_proxy.h" #include "internal/catch_impl.hpp" #endif diff --git a/include/internal/catch_console_colour.cpp b/include/internal/catch_console_colour.cpp index 946e2903..8b055b33 100644 --- a/include/internal/catch_console_colour.cpp +++ b/include/internal/catch_console_colour.cpp @@ -21,6 +21,7 @@ #include "catch_context.h" #include "catch_platform.h" #include "catch_debugger.h" +#include "catch_windows_h_proxy.h" namespace Catch { namespace { @@ -53,8 +54,6 @@ namespace Catch { #if defined ( CATCH_CONFIG_COLOUR_WINDOWS ) ///////////////////////////////////////// -#include "catch_windows_h_proxy.h" - namespace Catch { namespace {