3rd-party/catch2
1
0
Fork 0
mirror of https://github.com/catchorg/Catch2.git synced 2024-11-26 07:16:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

unconditional windows proxy

Browse Source
This commit is contained in:
philsquared 2017-10-11 14:58:20 +01:00
parent 17cdf20968
commit cc0b093c20
2 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/catch.hpp
View File

@ -62,10 +62,7 @@
#endif #endif
#ifdef CATCH_IMPL #ifdef CATCH_IMPL
#ifdef CATCH_PLATFORM_WINDOWS
#include "internal/catch_windows_h_proxy.h" #include "internal/catch_windows_h_proxy.h"
#endif
#include "internal/catch_impl.hpp" #include "internal/catch_impl.hpp"
#endif #endif

3
include/internal/catch_windows_h_proxy.h
View File

@ -11,6 +11,7 @@
#include "catch_platform.h" #include "catch_platform.h"
#if defined(CATCH_PLATFORM_WINDOWS) #if defined(CATCH_PLATFORM_WINDOWS)
#if !defined(NOMINMAX) && !defined(CATCH_CONFIG_NO_NOMINMAX) #if !defined(NOMINMAX) && !defined(CATCH_CONFIG_NO_NOMINMAX)
# define CATCH_DEFINED_NOMINMAX # define CATCH_DEFINED_NOMINMAX
# define NOMINMAX # define NOMINMAX
@ -19,7 +20,6 @@
# define CATCH_DEFINED_WIN32_LEAN_AND_MEAN # define CATCH_DEFINED_WIN32_LEAN_AND_MEAN
# define WIN32_LEAN_AND_MEAN # define WIN32_LEAN_AND_MEAN
#endif #endif
#endif
#ifdef __AFXDLL #ifdef __AFXDLL
#include <AfxWin.h> #include <AfxWin.h>
@ -34,5 +34,6 @@
# undef WIN32_LEAN_AND_MEAN # undef WIN32_LEAN_AND_MEAN
#endif #endif
#endif // defined(CATCH_PLATFORM_WINDOWS)
#endif // TWOBLUECUBES_CATCH_WINDOWS_H_PROXY_H_INCLUDED #endif // TWOBLUECUBES_CATCH_WINDOWS_H_PROXY_H_INCLUDED