diff options
| author | philsquared | 2017-10-11 14:58:20 +0100 |
|---|---|---|
| committer | philsquared | 2017-10-11 14:58:20 +0100 |
| commit | cc0b093c20180ff847956522641fdbb63fd2cd49 (patch) | |
| tree | ee12c8fb0cf0d897e2d5c013975fc321d7089558 /include | |
| parent | 17cdf209683de2a9da8469a81ae48def45624944 (diff) | |
| download | catch3-cc0b093c20180ff847956522641fdbb63fd2cd49.tar.gz | |
unconditional windows proxy
Diffstat (limited to 'include')
| -rw-r--r-- | include/catch.hpp | 5 | ||||
| -rw-r--r-- | include/internal/catch_windows_h_proxy.h | 17 |
2 files changed, 10 insertions, 12 deletions
diff --git a/include/catch.hpp b/include/catch.hpp index 377cb31e..edb588d1 100644 --- a/include/catch.hpp +++ b/include/catch.hpp @@ -62,10 +62,7 @@ #endif #ifdef CATCH_IMPL - #ifdef CATCH_PLATFORM_WINDOWS - #include "internal/catch_windows_h_proxy.h" - #endif - +#include "internal/catch_windows_h_proxy.h" #include "internal/catch_impl.hpp" #endif diff --git a/include/internal/catch_windows_h_proxy.h b/include/internal/catch_windows_h_proxy.h index bbb1ee82..a7a19c8e 100644 --- a/include/internal/catch_windows_h_proxy.h +++ b/include/internal/catch_windows_h_proxy.h @@ -11,14 +11,14 @@ #include "catch_platform.h" #if defined(CATCH_PLATFORM_WINDOWS) -# if !defined(NOMINMAX) && !defined(CATCH_CONFIG_NO_NOMINMAX) -# define CATCH_DEFINED_NOMINMAX -# define NOMINMAX -# endif -# if !defined(WIN32_LEAN_AND_MEAN) && !defined(CATCH_CONFIG_NO_WIN32_LEAN_AND_MEAN) -# define CATCH_DEFINED_WIN32_LEAN_AND_MEAN -# define WIN32_LEAN_AND_MEAN -# endif + +#if !defined(NOMINMAX) && !defined(CATCH_CONFIG_NO_NOMINMAX) +# define CATCH_DEFINED_NOMINMAX +# define NOMINMAX +#endif +#if !defined(WIN32_LEAN_AND_MEAN) && !defined(CATCH_CONFIG_NO_WIN32_LEAN_AND_MEAN) +# define CATCH_DEFINED_WIN32_LEAN_AND_MEAN +# define WIN32_LEAN_AND_MEAN #endif #ifdef __AFXDLL @@ -34,5 +34,6 @@ # undef WIN32_LEAN_AND_MEAN #endif +#endif // defined(CATCH_PLATFORM_WINDOWS) #endif // TWOBLUECUBES_CATCH_WINDOWS_H_PROXY_H_INCLUDED |