diff options
| author | Kai Koehne <kai.koehne@nokia.com> | 2012-09-17 12:32:09 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-09-26 10:08:59 +0200 |
| commit | f052ee467d257eb289b560c1420c59e6c558ba91 (patch) | |
| tree | 1ac6563a8ba15a95c8fc076a93cf3d9292ddbcfd | |
| parent | 8dcb7c81a43998c1c307f2a132647d63e9cf9161 (diff) | |
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>
4 files changed, 4 insertions, 4 deletions
diff --git a/src/network/socket/qnativesocketengine_win.cpp b/src/network/socket/qnativesocketengine_win.cpp index 0c14e1380b..be71ccb08d 100644 --- a/src/network/socket/qnativesocketengine_win.cpp +++ b/src/network/socket/qnativesocketengine_win.cpp @@ -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> diff --git a/tests/auto/network/kernel/qhostinfo/tst_qhostinfo.cpp b/tests/auto/network/kernel/qhostinfo/tst_qhostinfo.cpp index e86b0b7cde..973cf1fe5a 100644 --- a/tests/auto/network/kernel/qhostinfo/tst_qhostinfo.cpp +++ b/tests/auto/network/kernel/qhostinfo/tst_qhostinfo.cpp @@ -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> diff --git a/tests/auto/network/socket/qtcpserver/tst_qtcpserver.cpp b/tests/auto/network/socket/qtcpserver/tst_qtcpserver.cpp index 18401fb40d..d8df0323ca 100644 --- a/tests/auto/network/socket/qtcpserver/tst_qtcpserver.cpp +++ b/tests/auto/network/socket/qtcpserver/tst_qtcpserver.cpp @@ -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 diff --git a/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp b/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp index 829b38f1a5..446329b6e7 100644 --- a/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp +++ b/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp @@ -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 |