mirror of https://github.com/catchorg/Catch2.git
Extracted NOMINMAX and WIN32_LEAN_AND_MEAN guards into a proxy header
This commit is contained in:
parent
b3907a78e1
commit
afe46ff270
|
@ -41,25 +41,7 @@ namespace Catch {
|
||||||
|
|
||||||
#if defined ( CATCH_CONFIG_COLOUR_WINDOWS ) /////////////////////////////////////////
|
#if defined ( CATCH_CONFIG_COLOUR_WINDOWS ) /////////////////////////////////////////
|
||||||
|
|
||||||
# ifdef CATCH_DEFINES_NOMINMAX
|
#include "catch_windows_h_proxy.h"
|
||||||
# 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
|
|
||||||
|
|
||||||
namespace Catch {
|
namespace Catch {
|
||||||
namespace {
|
namespace {
|
||||||
|
|
|
@ -15,19 +15,7 @@
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef CATCH_PLATFORM_WINDOWS
|
#ifdef CATCH_PLATFORM_WINDOWS
|
||||||
# ifdef CATCH_DEFINES_NOMINMAX
|
#include "catch_windows_h_proxy.h"
|
||||||
# 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
|
|
||||||
#else
|
#else
|
||||||
#include <sys/time.h>
|
#include <sys/time.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -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
|
Loading…
Reference in New Issue