summaryrefslogtreecommitdiffstats
path: root/config.tests/unix/ipv6/ipv6test.cpp
diff options
context:
space:
mode:
authorDavid Boddie <dboddie@trolltech.com>2010-06-10 15:48:36 (GMT)
committerDavid Boddie <dboddie@trolltech.com>2010-06-10 15:48:36 (GMT)
commit700a4826cf6bd755df000cb16c259343efb695cd (patch)
tree69b19857c352891dd05b35ddf54b997634442379 /config.tests/unix/ipv6/ipv6test.cpp
parent3aee7b78ba1f6c1e4eab9202ddac58e01b3258e7 (diff)
parent9385f050620f14e3c3e4616906cf1999bf166041 (diff)
downloadQt-700a4826cf6bd755df000cb16c259343efb695cd.zip
Qt-700a4826cf6bd755df000cb16c259343efb695cd.tar.gz
Qt-700a4826cf6bd755df000cb16c259343efb695cd.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
Diffstat (limited to 'config.tests/unix/ipv6/ipv6test.cpp')
-rw-r--r--config.tests/unix/ipv6/ipv6test.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/config.tests/unix/ipv6/ipv6test.cpp b/config.tests/unix/ipv6/ipv6test.cpp
index 4fb27f2..4243f2d 100644
--- a/config.tests/unix/ipv6/ipv6test.cpp
+++ b/config.tests/unix/ipv6/ipv6test.cpp
@@ -46,9 +46,14 @@ platforms. We check for the required IPv6 data structures. */
#define _HPUX_SOURCE
#endif
+#ifdef __MINGW32__
+#include <winsock2.h>
+#include <ws2tcpip.h>
+#else
#include <sys/types.h>
#include <sys/socket.h>
#include <netinet/in.h>
+#endif
int main()
{