summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@nokia.com>2009-05-23 11:18:23 (GMT)
committerThiago Macieira <thiago.macieira@nokia.com>2009-05-23 11:24:25 (GMT)
commita5104ef77f71b068228ffe6d7c64845889c18c81 (patch)
treee909e71027dab2671795cad0cfd644bd178f9707
parent701bdcbc8b7751834f6d24844bcb91a23cbdc409 (diff)
downloadQt-a5104ef77f71b068228ffe6d7c64845889c18c81.zip
Qt-a5104ef77f71b068228ffe6d7c64845889c18c81.tar.gz
Qt-a5104ef77f71b068228ffe6d7c64845889c18c81.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
-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 0a34e2b..472bc4b 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?