diff --git a/include/internal/catch_debug_console.cpp b/include/internal/catch_debug_console.cpp index d817c561..5d25f651 100644 --- a/include/internal/catch_debug_console.cpp +++ b/include/internal/catch_debug_console.cpp @@ -9,21 +9,23 @@ #include "catch_debug_console.h" #include "catch_stream.h" #include "catch_platform.h" +#include "catch_windows_h_proxy.h" #ifdef CATCH_PLATFORM_WINDOWS -#include "catch_windows_h_proxy.h" - namespace Catch { void writeToDebugConsole( std::string const& text ) { ::OutputDebugStringA( text.c_str() ); } } + #else + namespace Catch { void writeToDebugConsole( std::string const& text ) { // !TBD: Need a version for Mac/ XCode and other IDEs Catch::cout() << text; } } + #endif // Platform diff --git a/include/internal/catch_fatal_condition.h b/include/internal/catch_fatal_condition.h index 9977702a..29e3b692 100644 --- a/include/internal/catch_fatal_condition.h +++ b/include/internal/catch_fatal_condition.h @@ -9,13 +9,13 @@ #ifndef TWOBLUECUBES_CATCH_FATAL_CONDITION_H_INCLUDED #define TWOBLUECUBES_CATCH_FATAL_CONDITION_H_INCLUDED -#include #include "catch_platform.h" #include "catch_compiler_capabilities.h" +#include "catch_windows_h_proxy.h" #if defined ( CATCH_PLATFORM_WINDOWS ) ///////////////////////////////////////// -#include "catch_windows_h_proxy.h" + # if !defined ( CATCH_CONFIG_WINDOWS_SEH ) diff --git a/include/internal/catch_session.cpp b/include/internal/catch_session.cpp index 71317eba..9ccb16f8 100644 --- a/include/internal/catch_session.cpp +++ b/include/internal/catch_session.cpp @@ -19,6 +19,7 @@ #include "catch_startup_exception_registry.h" #include "catch_text.h" #include "catch_stream.h" +#include "catch_windows_h_proxy.h" #include #include