From f052ee467d257eb289b560c1420c59e6c558ba91 Mon Sep 17 00:00:00 2001
From: Kai Koehne <kai.koehne@nokia.com>
Date: Mon, 17 Sep 2012 12:32:09 +0200
Subject: 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 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/network/socket/qnativesocketengine_win.cpp')

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>
-- 
cgit v1.2.3