feedc0de/Catch2
1
0
Fork 0
forked from catchorg/Catch2
Code Pull Requests Activity

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

14
include/internal/catch_timer.hpp
View File

@@ -15,19 +15,7 @@
#endif
#ifdef CATCH_PLATFORM_WINDOWS
# ifdef CATCH_DEFINES_NOMINMAX
# define NOMINMAX
# endif
# ifdef CATCH_DEFINES_WIN32_LEAN_AND_MEAN
# define WIN32_LEAN_AND_MEAN
# endif
#include <windows.h>
# 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"
#else
#include <sys/time.h>
#endif