summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@nokia.com>2009-05-23 11:18:23 (GMT)
committerJason McDonald <jason.mcdonald@nokia.com>2009-05-23 11:28:35 (GMT)
commite4460e465cb34ebfb219c4669501f3740db826fb (patch)
tree2b854eab07872ccb0e9cd791568c048a1432de5c
parent8247a6fe8105663d791dea5fa80e01e3be859c6c (diff)
downloadQt-e4460e465cb34ebfb219c4669501f3740db826fb.zip
Qt-e4460e465cb34ebfb219c4669501f3740db826fb.tar.gz
Qt-e4460e465cb34ebfb219c4669501f3740db826fb.tar.bz2
Fix another compilation breakage introduced by the fix to the
compilation breakage introduced in 6c1d7e57. The fix in fc7a43cce did fix the failure, but created another one because qhostinfo_win.cpp also had a copy of qt_sockaddr_in6 Reviewed-by: Jason McDonald (cherry picked from commit a5104ef77f71b068228ffe6d7c64845889c18c81)
-rw-r--r--src/network/kernel/qhostinfo_win.cpp15
1 files changed, 0 insertions, 15 deletions
diff --git a/src/network/kernel/qhostinfo_win.cpp b/src/network/kernel/qhostinfo_win.cpp
index 036068d..e084a21 100644
--- a/src/network/kernel/qhostinfo_win.cpp
+++ b/src/network/kernel/qhostinfo_win.cpp
@@ -72,21 +72,6 @@ struct qt_addrinfo
qt_addrinfo *ai_next;
};
-// sockaddr_in6 size changed between old and new SDK
-// Only the new version is the correct one, so always
-// use this structure.
-struct qt_in6_addr {
- uchar qt_s6_addr[16];
-};
-
-struct qt_sockaddr_in6 {
- short sin6_family; /* AF_INET6 */
- u_short sin6_port; /* Transport level port number */
- u_long sin6_flowinfo; /* IPv6 flow information */
- struct qt_in6_addr sin6_addr; /* IPv6 address */
- u_long sin6_scope_id; /* set of interfaces for a scope */
-};
-
//###
#define QT_SOCKLEN_T int
#ifndef NI_MAXHOST // already defined to 1025 in ws2tcpip.h?