diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2009-05-22 14:55:28 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2009-05-22 14:57:14 (GMT) |
| commit | fc7a43cceba63b79a40183334ab97527483113e3 (patch) | |
| tree | f4da6ee4c45ae0f57e109e7fe702ed2dbb905399 /src/network/socket/qnativesocketengine_unix.cpp | |
| parent | 049135667302482af66eeaf9a2323d5ee1551132 (diff) | |
| download | Qt-fc7a43cceba63b79a40183334ab97527483113e3.zip Qt-fc7a43cceba63b79a40183334ab97527483113e3.tar.gz Qt-fc7a43cceba63b79a40183334ab97527483113e3.tar.bz2 | |
Fix compilation breakage on Windows caused by 6c1d7e57.
On Windows, QT_NO_IPV6 isn't defined, but the necessary includes were
missing. So #include winsock2.h and also use our own structures.
Reviewed-By: Trust Me
Diffstat (limited to 'src/network/socket/qnativesocketengine_unix.cpp')
| -rw-r--r-- | src/network/socket/qnativesocketengine_unix.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/network/socket/qnativesocketengine_unix.cpp b/src/network/socket/qnativesocketengine_unix.cpp index 2b11e8e..75b5a64 100644 --- a/src/network/socket/qnativesocketengine_unix.cpp +++ b/src/network/socket/qnativesocketengine_unix.cpp @@ -119,7 +119,7 @@ static inline void qt_socket_getPortAndAddress(const qt_sockaddr *s, quint16 *po #if !defined(QT_NO_IPV6) if (s->a.sa_family == AF_INET6) { Q_IPV6ADDR tmp; - memcpy(&tmp, &s->a6.sin6_addr.s6_addr, sizeof(tmp)); + memcpy(&tmp, &s->a6.sin6_addr, sizeof(tmp)); if (addr) { QHostAddress tmpAddress; tmpAddress.setAddress(tmp); |