Win: [skip ci] check if NOMINMAX is already defined before setting it

This commit is contained in:
wmayer
2020-11-11 13:34:42 +01:00
parent 1b8f4747e6
commit b7f9e351c5
10 changed files with 20 additions and 0 deletions

View File

@@ -39,8 +39,10 @@
#ifdef FC_OS_WIN32
#define WIN32_LEAN_AND_MEAN
#ifndef NOMINMAX
#define NOMINMAX
#endif
#endif
#ifdef _PreComp_

View File

@@ -46,7 +46,9 @@
#ifdef FC_OS_WIN32
#include <direct.h>
#define WIN32_LEAN_AND_MEAN
#ifndef NOMINMAX
#define NOMINMAX
#endif
#include <windows.h>
#include <crtdbg.h>
#include <shellapi.h>

View File

@@ -28,8 +28,10 @@
#ifdef FC_OS_WIN32
#define WIN32_LEAN_AND_MEAN
#ifndef NOMINMAX
#define NOMINMAX
#endif
#endif
// here get the warnings of too long specifiers disabled (needed for VC6)
#ifdef _MSC_VER

View File

@@ -40,7 +40,9 @@
#endif
#ifdef FC_OS_WIN32
# ifndef NOMINMAX
# define NOMINMAX
# endif
#endif
#ifdef _MSC_VER

View File

@@ -39,8 +39,10 @@
#ifdef FC_OS_WIN32
#define WIN32_LEAN_AND_MEAN
#ifndef NOMINMAX
#define NOMINMAX
#endif
#endif
#ifdef _PreComp_

View File

@@ -86,7 +86,9 @@
#endif
#elif defined(FC_OS_WIN32)
#ifndef NOMINMAX
#define NOMINMAX
#endif
#include <Windows.h>
#endif //_PreComp_

View File

@@ -96,7 +96,9 @@
#elif defined(FC_OS_WIN32)
#define WIN32_LEAN_AND_MEAN
#ifndef NOMINMAX
#define NOMINMAX
#endif
#include <windows.h>
#endif //_PreComp_

View File

@@ -36,7 +36,9 @@
#endif
#ifdef FC_OS_WIN32
# ifndef NOMINMAX
# define NOMINMAX
# endif
#endif
// here get the warnings of too long specifiers disabled (needed for VC6)

View File

@@ -36,7 +36,9 @@
#endif
#ifdef FC_OS_WIN32
# ifndef NOMINMAX
# define NOMINMAX
# endif
#endif
#ifdef _PreComp_

View File

@@ -86,7 +86,9 @@
#include <Python.h>
#elif defined(FC_OS_WIN32)
#ifndef NOMINMAX
#define NOMINMAX
#endif
#include <windows.h>
#endif // _PreComp_
#endif