Fix MinGW/gcc warning about NOMINMAX being redefined
Commit 5230d62fe
added a #define NOMINMAX, which conflicts with a
NOMINMAX definition in the MinGW headers. Just use the same definition
as in MinGW to fix the gcc warning.
Change-Id: Ib21dd323ebbdca5d143e394c7631303e0c72541a
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
parent
8dcb7c81a4
commit
f052ee467d
@ -40,7 +40,7 @@
|
||||
****************************************************************************/
|
||||
|
||||
// Prevent windows system header files from defining min/max as macros.
|
||||
#define NOMINMAX
|
||||
#define NOMINMAX 1
|
||||
|
||||
#include <winsock2.h>
|
||||
#include <ws2tcpip.h>
|
||||
|
@ -51,7 +51,7 @@
|
||||
#endif
|
||||
|
||||
// To prevent windows system header files from re-defining min/max
|
||||
#define NOMINMAX
|
||||
#define NOMINMAX 1
|
||||
|
||||
#if defined(Q_OS_WIN) && !defined(QT_NO_GETADDRINFO)
|
||||
# include <winsock2.h>
|
||||
|
@ -41,7 +41,7 @@
|
||||
|
||||
#include <qglobal.h>
|
||||
// To prevent windows system header files from re-defining min/max
|
||||
#define NOMINMAX
|
||||
#define NOMINMAX 1
|
||||
#if defined(_WIN32)
|
||||
#include <winsock2.h>
|
||||
#else
|
||||
|
@ -42,7 +42,7 @@
|
||||
#include <qglobal.h>
|
||||
|
||||
// To prevent windows system header files from re-defining min/max
|
||||
#define NOMINMAX
|
||||
#define NOMINMAX 1
|
||||
#if defined(_WIN32)
|
||||
#include <winsock2.h>
|
||||
#else
|
||||
|
Loading…
Reference in New Issue
Block a user