summaryrefslogtreecommitdiffstatshomepage
path: root/3rdparty/catch/include/internal/catch_console_colour_impl.hpp
diff options
context:
space:
mode:
author Miodrag Milanovic <mmicko@gmail.com>2017-02-05 15:45:26 +0100
committer Miodrag Milanovic <mmicko@gmail.com>2017-02-05 15:46:07 +0100
commit02c97cd0f7c4d630f1a90f9f2626746e47a28c09 (patch)
tree2b48d051a55f2b65525824546cd9fcf9e05907cf /3rdparty/catch/include/internal/catch_console_colour_impl.hpp
parentd20b4ba6864b45d0c068d98d43e63c8bc5014a3b (diff)
Updated Catch to latest (nw)
Diffstat (limited to '3rdparty/catch/include/internal/catch_console_colour_impl.hpp')
-rw-r--r--3rdparty/catch/include/internal/catch_console_colour_impl.hpp12
1 files changed, 2 insertions, 10 deletions
diff --git a/3rdparty/catch/include/internal/catch_console_colour_impl.hpp b/3rdparty/catch/include/internal/catch_console_colour_impl.hpp
index f776952bfe7..ba2a9d1c3ae 100644
--- a/3rdparty/catch/include/internal/catch_console_colour_impl.hpp
+++ b/3rdparty/catch/include/internal/catch_console_colour_impl.hpp
@@ -41,15 +41,7 @@ namespace Catch {
#if defined ( CATCH_CONFIG_COLOUR_WINDOWS ) /////////////////////////////////////////
-#ifndef NOMINMAX
-#define NOMINMAX
-#endif
-
-#ifdef __AFXDLL
-#include <AfxWin.h>
-#else
-#include <windows.h>
-#endif
+#include "catch_windows_h_proxy.h"
namespace Catch {
namespace {
@@ -131,7 +123,7 @@ namespace {
case Colour::White: return setColour( "[0m" );
case Colour::Red: return setColour( "[0;31m" );
case Colour::Green: return setColour( "[0;32m" );
- case Colour::Blue: return setColour( "[0:34m" );
+ case Colour::Blue: return setColour( "[0;34m" );
case Colour::Cyan: return setColour( "[0;36m" );
case Colour::Yellow: return setColour( "[0;33m" );
case Colour::Grey: return setColour( "[1;30m" );