AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix MinGW/gcc warning about NOMINMAX being redefined

Browse Source 
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:
Kai Koehne 2012-09-17 12:32:09 +02:00 committed by The Qt Project
parent 8dcb7c81a4
commit f052ee467d
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/network/socket/qnativesocketengine_win.cpp
View File

@ -40,7 +40,7 @@
****************************************************************************/ ****************************************************************************/
// Prevent windows system header files from defining min/max as macros. // Prevent windows system header files from defining min/max as macros.
#define NOMINMAX #define NOMINMAX 1
#include <winsock2.h> #include <winsock2.h>
#include <ws2tcpip.h> #include <ws2tcpip.h>

2
tests/auto/network/kernel/qhostinfo/tst_qhostinfo.cpp
View File

@ -51,7 +51,7 @@
#endif #endif
// To prevent windows system header files from re-defining min/max // 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) #if defined(Q_OS_WIN) && !defined(QT_NO_GETADDRINFO)
# include <winsock2.h> # include <winsock2.h>

2
tests/auto/network/socket/qtcpserver/tst_qtcpserver.cpp
View File

@ -41,7 +41,7 @@
#include <qglobal.h> #include <qglobal.h>
// To prevent windows system header files from re-defining min/max // To prevent windows system header files from re-defining min/max
#define NOMINMAX #define NOMINMAX 1
#if defined(_WIN32) #if defined(_WIN32)
#include <winsock2.h> #include <winsock2.h>
#else #else

2
tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp
View File

@ -42,7 +42,7 @@
#include <qglobal.h> #include <qglobal.h>
// To prevent windows system header files from re-defining min/max // To prevent windows system header files from re-defining min/max
#define NOMINMAX #define NOMINMAX 1
#if defined(_WIN32) #if defined(_WIN32)
#include <winsock2.h> #include <winsock2.h>
#else #else