diff options
Diffstat (limited to 'src/network/kernel/qhostaddress.cpp')
| -rw-r--r-- | src/network/kernel/qhostaddress.cpp | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/src/network/kernel/qhostaddress.cpp b/src/network/kernel/qhostaddress.cpp index bff351c34f..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> @@ -65,7 +64,6 @@ QT_BEGIN_NAMESPACE } while (0) #ifdef Q_OS_WIN -# if !defined (QT_NO_IPV6) // sockaddr_in6 size changed between old and new SDK // Only the new version is the correct one, so always // use this structure. @@ -90,12 +88,6 @@ typedef struct { struct qt_in6_addr sin6_addr; /* IPv6 address */ u_long sin6_scope_id; /* set of interfaces for a scope */ } qt_sockaddr_in6; -# else -typedef void * qt_sockaddr_in6 ; -# endif -# ifndef AF_INET6 -# define AF_INET6 23 /* Internetwork Version 6 */ -# endif #else #define qt_sockaddr_in6 sockaddr_in6 #define qt_s6_addr s6_addr @@ -545,10 +537,8 @@ QHostAddress::QHostAddress(const struct sockaddr *sockaddr) { if (sockaddr->sa_family == AF_INET) setAddress(htonl(((sockaddr_in *)sockaddr)->sin_addr.s_addr)); -#ifndef QT_NO_IPV6 else if (sockaddr->sa_family == AF_INET6) setAddress(((qt_sockaddr_in6 *)sockaddr)->sin6_addr.qt_s6_addr); -#endif } /*! @@ -700,10 +690,8 @@ void QHostAddress::setAddress(const struct sockaddr *sockaddr) clear(); if (sockaddr->sa_family == AF_INET) setAddress(htonl(((sockaddr_in *)sockaddr)->sin_addr.s_addr)); -#ifndef QT_NO_IPV6 else if (sockaddr->sa_family == AF_INET6) setAddress(((qt_sockaddr_in6 *)sockaddr)->sin6_addr.qt_s6_addr); -#endif } /*! |