diff options
| author | Martin Petersson <martin.petersson@nokia.com> | 2011-07-05 16:04:38 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-07-05 17:03:32 +0200 |
| commit | 21c4f1806e3cc1f9893ddedfa68000a750eb1fdc (patch) | |
| tree | d82abac0273d8d74be4344e320cfee0a5184271a /src/network/kernel | |
| parent | d789e40c58c1ce8441d3bb4d6ca8d01fe02ad1a7 (diff) | |
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
Diffstat (limited to 'src/network/kernel')
| -rw-r--r-- | src/network/kernel/qhostaddress.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
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> |