eden-emu/Catch2
15
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Extracted NOMINMAX and WIN32_LEAN_AND_MEAN guards into a proxy header

Browse source
This commit is contained in:
Martin Hořeňovský 2017-01-16 16:52:44 +01:00
parent b3907a78e1
commit afe46ff270
3 changed files with 34 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

20
include/internal/catch_console_colour_impl.hpp
View file

@ -41,25 +41,7 @@ namespace Catch {
#if defined ( CATCH_CONFIG_COLOUR_WINDOWS ) /////////////////////////////////////////
# ifdef CATCH_DEFINES_NOMINMAX
# define NOMINMAX
# endif
# ifdef CATCH_DEFINES_WIN32_LEAN_AND_MEAN
# define WIN32_LEAN_AND_MEAN
# endif
#ifdef __AFXDLL
#include <AfxWin.h>
#else
#include <windows.h>
#endif
# ifdef CATCH_DEFINES_NOMINMAX
# undef NOMINMAX
# endif
# ifdef CATCH_DEFINES_WIN32_LEAN_AND_MEAN
# undef WIN32_LEAN_AND_MEAN
# endif
#include "catch_windows_h_proxy.h"
namespace Catch {
namespace {