guard NOMINMAX definition (windows)

2013-06-29 20:31:17 +01:00
parent cd688300b0
commit 4b5e008b20
5 changed files with 11 additions and 7 deletions
--- a/include/internal/catch_console_colour_impl.hpp
+++ b/include/internal/catch_console_colour_impl.hpp
@@ -19,7 +19,9 @@ namespace Catch { namespace Detail {

 #if defined ( CATCH_PLATFORM_WINDOWS ) /////////////////////////////////////////

+#ifndef NOMINMAX
 #define NOMINMAX
+#endif
 #include <windows.h>

 namespace Catch {