3rd-party/catch2
1
0
Fork 0
mirror of https://github.com/catchorg/Catch2.git synced 2024-11-25 23:06:10 +01:00
Code Issues Packages Projects Releases Wiki 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
Show Stats 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 {

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

32
include/internal/catch_windows_h_proxy.h Normal file
View File

@ -0,0 +1,32 @@
/*
* Created by Martin on 16/01/2017.
*
* Distributed under the Boost Software License, Version 1.0. (See accompanying
* file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
*/
#ifndef TWOBLUECUBES_CATCH_WINDOWS_H_PROXY_H_INCLUDED
#define TWOBLUECUBES_CATCH_WINDOWS_H_PROXY_H_INCLUDED
#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
#endif // TWOBLUECUBES_CATCH_WINDOWS_H_PROXY_H_INCLUDED