diff options
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 |