diff options
| author | Martin Hořeňovský | 2018-02-23 12:40:12 +0100 |
|---|---|---|
| committer | Martin Hořeňovský | 2018-02-23 12:40:12 +0100 |
| commit | 0c5df42c28f3c5450293c54ab1d2f98985e62607 (patch) | |
| tree | e75e2ae9dc2f6eece41017ec7eb20c0d31f58c49 /include/internal/catch_debug_console.cpp | |
| parent | 4e57661919e07d8f9e7fcefe73db31a96ab18867 (diff) | |
| download | catch3-0c5df42c28f3c5450293c54ab1d2f98985e62607.tar.gz | |
Fix how windows.h is included in our files.
To prevent bugs with stitching system headers inside Catch,
the proxy header is responsible for guarding against inclusion
on Linux, rather than the includers.
Might be related to #1197
Diffstat (limited to 'include/internal/catch_debug_console.cpp')
| -rw-r--r-- | include/internal/catch_debug_console.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
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 |