From 21c4f1806e3cc1f9893ddedfa68000a750eb1fdc Mon Sep 17 00:00:00 2001
From: Martin Petersson <martin.petersson@nokia.com>
Date: Tue, 5 Jul 2011 16:04:38 +0200
Subject: QHostAddress: fix compile on Windows

AF_INET6 needs to be defined on Windows. This got undefined when
QT_NO_IPV6 was removed in 85869920bb9a4ee45cf4a89e74b1bd3d4ce67eaa

Change-Id: I1b4904f9561286b884324882f0f11dc29ba01416
Reviewed-on: http://codereview.qt.nokia.com/1169
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Markus Goetz
---
 src/network/kernel/qhostaddress.cpp | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'src/network')

diff --git a/src/network/kernel/qhostaddress.cpp b/src/network/kernel/qhostaddress.cpp
index 24048113ac..3dd7461a75 100644
--- a/src/network/kernel/qhostaddress.cpp
+++ b/src/network/kernel/qhostaddress.cpp
@@ -38,19 +38,18 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-
 #include "qhostaddress.h"
 #include "qhostaddress_p.h"
 #include "qdebug.h"
+#if defined(Q_OS_WIN)
+#include <winsock2.h>
+#endif
 #include "qplatformdefs.h"
 #include "qstringlist.h"
 #include "qendian.h"
 #ifndef QT_NO_DATASTREAM
 #include <qdatastream.h>
 #endif
-#if defined(Q_OS_WINCE)
-#include <winsock.h>
-#endif
 
 #ifdef QT_LINUXBASE
 #  include <arpa/inet.h>
-- 
cgit v1.2.3