Fix MinGW/gcc warning about NOMINMAX being redefined
authorKai Koehne <kai.koehne@nokia.com>
Mon, 17 Sep 2012 10:32:09 +0000 (12:32 +0200)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Wed, 26 Sep 2012 08:08:59 +0000 (10:08 +0200)
commitf052ee467d257eb289b560c1420c59e6c558ba91
tree1ac6563a8ba15a95c8fc076a93cf3d9292ddbcfd
parent8dcb7c81a43998c1c307f2a132647d63e9cf9161
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>
src/network/socket/qnativesocketengine_win.cpp
tests/auto/network/kernel/qhostinfo/tst_qhostinfo.cpp
tests/auto/network/socket/qtcpserver/tst_qtcpserver.cpp
tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp