diff options
| author | Martin Hořeňovský | 2022-02-05 16:21:06 +0100 |
|---|---|---|
| committer | Martin Hořeňovský | 2022-02-05 16:21:06 +0100 |
| commit | c912f62fc46b2c1ab048399a5dadda703952dddf (patch) | |
| tree | d57fd73886168fb3ec4519d454b10946628f36ff /src/catch2 | |
| parent | aa3c7be434c707aabe292c069c5c90d3cb25ada5 (diff) | |
| download | catch3-c912f62fc46b2c1ab048399a5dadda703952dddf.tar.gz | |
Remove Windows.h related defines
Diffstat (limited to 'src/catch2')
| -rw-r--r-- | src/catch2/internal/catch_windows_h_proxy.hpp | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/src/catch2/internal/catch_windows_h_proxy.hpp b/src/catch2/internal/catch_windows_h_proxy.hpp index a4c11fa6..14fe747d 100644 --- a/src/catch2/internal/catch_windows_h_proxy.hpp +++ b/src/catch2/internal/catch_windows_h_proxy.hpp @@ -12,12 +12,12 @@ #if defined(CATCH_PLATFORM_WINDOWS) -#if !defined(NOMINMAX) && !defined(CATCH_CONFIG_NO_NOMINMAX) -# define CATCH_DEFINED_NOMINMAX +// We might end up with the define made globally through the compiler, +// and we don't want to trigger warnings for this +#if !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 +#if !defined(WIN32_LEAN_AND_MEAN) # define WIN32_LEAN_AND_MEAN #endif @@ -27,13 +27,6 @@ #include <windows.h> #endif -#ifdef CATCH_DEFINED_NOMINMAX -# undef NOMINMAX -#endif -#ifdef CATCH_DEFINED_WIN32_LEAN_AND_MEAN -# undef WIN32_LEAN_AND_MEAN -#endif - #endif // defined(CATCH_PLATFORM_WINDOWS) #endif // CATCH_WINDOWS_H_PROXY_HPP_INCLUDED |