diff --git a/mkspecs/android-clang/qplatformdefs.h b/mkspecs/android-clang/qplatformdefs.h index 017233658e3..b9d987e6088 100644 --- a/mkspecs/android-clang/qplatformdefs.h +++ b/mkspecs/android-clang/qplatformdefs.h @@ -71,10 +71,6 @@ #include #include -#ifndef QT_NO_IPV6IFNAME -#include -#endif - #ifndef _GNU_SOURCE # define _GNU_SOURCE #endif diff --git a/mkspecs/android-g++/qplatformdefs.h b/mkspecs/android-g++/qplatformdefs.h index 068f437c11f..a0e80629a4b 100644 --- a/mkspecs/android-g++/qplatformdefs.h +++ b/mkspecs/android-g++/qplatformdefs.h @@ -71,10 +71,6 @@ #include #include -#ifndef QT_NO_IPV6IFNAME -#include -#endif - #ifndef _GNU_SOURCE # define _GNU_SOURCE #endif diff --git a/mkspecs/common/aix/qplatformdefs.h b/mkspecs/common/aix/qplatformdefs.h index 7bb8dfedd2f..3606a2f1cb5 100644 --- a/mkspecs/common/aix/qplatformdefs.h +++ b/mkspecs/common/aix/qplatformdefs.h @@ -75,9 +75,6 @@ #include #include #include -#ifndef QT_NO_IPV6IFNAME -#include -#endif // Only AIX 4.3 and better support 64-bit diff --git a/mkspecs/common/android/qplatformdefs.h b/mkspecs/common/android/qplatformdefs.h index 048eb47c6cc..23180c5d3c1 100644 --- a/mkspecs/common/android/qplatformdefs.h +++ b/mkspecs/common/android/qplatformdefs.h @@ -70,10 +70,6 @@ #include #include -#ifndef QT_NO_IPV6IFNAME -#include -#endif - #ifndef _GNU_SOURCE # define _GNU_SOURCE #endif diff --git a/mkspecs/common/bsd/qplatformdefs.h b/mkspecs/common/bsd/qplatformdefs.h index 6c3a00b1946..8e976d32907 100644 --- a/mkspecs/common/bsd/qplatformdefs.h +++ b/mkspecs/common/bsd/qplatformdefs.h @@ -70,9 +70,6 @@ #include #include #include -#ifndef QT_NO_IPV6IFNAME -#include -#endif #include "../posix/qplatformdefs.h" diff --git a/mkspecs/common/integrity/qplatformdefs.h b/mkspecs/common/integrity/qplatformdefs.h index 7039318f25d..f0b4dea8e1b 100644 --- a/mkspecs/common/integrity/qplatformdefs.h +++ b/mkspecs/common/integrity/qplatformdefs.h @@ -68,9 +68,6 @@ #include #include #include -#ifndef QT_NO_IPV6IFNAME -#include -#endif // for htonl #include diff --git a/mkspecs/common/mac/qplatformdefs.h b/mkspecs/common/mac/qplatformdefs.h index 5cacd5a7490..1927587097c 100644 --- a/mkspecs/common/mac/qplatformdefs.h +++ b/mkspecs/common/mac/qplatformdefs.h @@ -70,9 +70,6 @@ #include #define __APPLE_USE_RFC_3542 #include -#ifndef QT_NO_IPV6IFNAME -#include -#endif #include "../posix/qplatformdefs.h" diff --git a/mkspecs/common/qnx/qplatformdefs.h b/mkspecs/common/qnx/qplatformdefs.h index 72fc92738c9..b30cd96002f 100644 --- a/mkspecs/common/qnx/qplatformdefs.h +++ b/mkspecs/common/qnx/qplatformdefs.h @@ -73,9 +73,6 @@ #include #include #include -#ifndef QT_NO_IPV6IFNAME -#include -#endif // for htonl #include diff --git a/mkspecs/darwin-g++/qplatformdefs.h b/mkspecs/darwin-g++/qplatformdefs.h index 46a93832380..faed56310d6 100644 --- a/mkspecs/darwin-g++/qplatformdefs.h +++ b/mkspecs/darwin-g++/qplatformdefs.h @@ -68,9 +68,6 @@ #include #include #include -#ifndef QT_NO_IPV6IFNAME -#include -#endif #include "../common/posix/qplatformdefs.h" diff --git a/mkspecs/haiku-g++/qplatformdefs.h b/mkspecs/haiku-g++/qplatformdefs.h index 000541912fc..21636c031ef 100644 --- a/mkspecs/haiku-g++/qplatformdefs.h +++ b/mkspecs/haiku-g++/qplatformdefs.h @@ -67,9 +67,6 @@ #include #include #include -#ifndef QT_NO_IPV6IFNAME -#include -#endif #include "../common/posix/qplatformdefs.h" diff --git a/mkspecs/hpuxi-g++-64/qplatformdefs.h b/mkspecs/hpuxi-g++-64/qplatformdefs.h index 966dfcf8c28..816fd0de6cb 100644 --- a/mkspecs/hpuxi-g++-64/qplatformdefs.h +++ b/mkspecs/hpuxi-g++-64/qplatformdefs.h @@ -70,9 +70,6 @@ #include #include #include -#ifndef QT_NO_IPV6IFNAME -#include -#endif #define QT_USE_XOPEN_LFS_EXTENSIONS #define QT_NO_READDIR64 diff --git a/mkspecs/hurd-g++/qplatformdefs.h b/mkspecs/hurd-g++/qplatformdefs.h index 9ee7de783b4..3c80cbdfade 100644 --- a/mkspecs/hurd-g++/qplatformdefs.h +++ b/mkspecs/hurd-g++/qplatformdefs.h @@ -76,9 +76,6 @@ #include #include #include -#ifndef QT_NO_IPV6IFNAME -#include -#endif #include "../common/posix/qplatformdefs.h" diff --git a/mkspecs/linux-clang/qplatformdefs.h b/mkspecs/linux-clang/qplatformdefs.h index d29225f12f8..a818d973f08 100644 --- a/mkspecs/linux-clang/qplatformdefs.h +++ b/mkspecs/linux-clang/qplatformdefs.h @@ -75,9 +75,6 @@ #include #include #include -#ifndef QT_NO_IPV6IFNAME -#include -#endif #define QT_USE_XOPEN_LFS_EXTENSIONS #include "../common/posix/qplatformdefs.h" diff --git a/mkspecs/linux-g++/qplatformdefs.h b/mkspecs/linux-g++/qplatformdefs.h index c9c0db7b5e2..13523f07023 100644 --- a/mkspecs/linux-g++/qplatformdefs.h +++ b/mkspecs/linux-g++/qplatformdefs.h @@ -75,9 +75,6 @@ #include #include #include -#ifndef QT_NO_IPV6IFNAME -#include -#endif #define QT_USE_XOPEN_LFS_EXTENSIONS #include "../common/posix/qplatformdefs.h" diff --git a/mkspecs/linux-llvm/qplatformdefs.h b/mkspecs/linux-llvm/qplatformdefs.h index 1b2a8997cf5..dc750ab1ef3 100644 --- a/mkspecs/linux-llvm/qplatformdefs.h +++ b/mkspecs/linux-llvm/qplatformdefs.h @@ -76,9 +76,6 @@ #include #include #include -#ifndef QT_NO_IPV6IFNAME -#include -#endif #define QT_USE_XOPEN_LFS_EXTENSIONS #include "../common/posix/qplatformdefs.h" diff --git a/mkspecs/linux-lsb-g++/qplatformdefs.h b/mkspecs/linux-lsb-g++/qplatformdefs.h index 0ff012aaf3c..4c4e53da2ac 100644 --- a/mkspecs/linux-lsb-g++/qplatformdefs.h +++ b/mkspecs/linux-lsb-g++/qplatformdefs.h @@ -77,9 +77,6 @@ #include #include #include -#ifndef QT_NO_IPV6IFNAME -#include -#endif // LSB 3.1 defines htonl and friends here #include diff --git a/mkspecs/lynxos-g++/qplatformdefs.h b/mkspecs/lynxos-g++/qplatformdefs.h index 7231b178409..4339ea2b23f 100644 --- a/mkspecs/lynxos-g++/qplatformdefs.h +++ b/mkspecs/lynxos-g++/qplatformdefs.h @@ -69,9 +69,6 @@ #include #include #include -#ifndef QT_NO_IPV6IFNAME -#include -#endif #include "../common/posix/qplatformdefs.h" diff --git a/mkspecs/solaris-cc-64/qplatformdefs.h b/mkspecs/solaris-cc-64/qplatformdefs.h index 7a010819339..f430664a9ed 100644 --- a/mkspecs/solaris-cc-64/qplatformdefs.h +++ b/mkspecs/solaris-cc-64/qplatformdefs.h @@ -70,9 +70,6 @@ #include #include #include -#ifndef QT_NO_IPV6IFNAME -#include -#endif #define QT_USE_XOPEN_LFS_EXTENSIONS #include "../common/posix/qplatformdefs.h" diff --git a/mkspecs/solaris-cc/qplatformdefs.h b/mkspecs/solaris-cc/qplatformdefs.h index a5ad9005a00..8350836deb6 100644 --- a/mkspecs/solaris-cc/qplatformdefs.h +++ b/mkspecs/solaris-cc/qplatformdefs.h @@ -70,9 +70,6 @@ #include #include #include -#ifndef QT_NO_IPV6IFNAME -#include -#endif #define QT_USE_XOPEN_LFS_EXTENSIONS #include "../common/posix/qplatformdefs.h" diff --git a/mkspecs/solaris-g++-64/qplatformdefs.h b/mkspecs/solaris-g++-64/qplatformdefs.h index 7504912a897..ae559183ff5 100644 --- a/mkspecs/solaris-g++-64/qplatformdefs.h +++ b/mkspecs/solaris-g++-64/qplatformdefs.h @@ -73,9 +73,6 @@ #include #include #include -#ifndef QT_NO_IPV6IFNAME -#include -#endif #define QT_USE_XOPEN_LFS_EXTENSIONS #include "../common/posix/qplatformdefs.h" diff --git a/mkspecs/solaris-g++/qplatformdefs.h b/mkspecs/solaris-g++/qplatformdefs.h index 112850ee8ab..bd14a86b518 100644 --- a/mkspecs/solaris-g++/qplatformdefs.h +++ b/mkspecs/solaris-g++/qplatformdefs.h @@ -73,9 +73,6 @@ #include #include #include -#ifndef QT_NO_IPV6IFNAME -#include -#endif #define QT_USE_XOPEN_LFS_EXTENSIONS #include "../common/posix/qplatformdefs.h" diff --git a/mkspecs/unsupported/qnx-X11-g++/qplatformdefs.h b/mkspecs/unsupported/qnx-X11-g++/qplatformdefs.h index de4a2cc2cb6..e090179f527 100644 --- a/mkspecs/unsupported/qnx-X11-g++/qplatformdefs.h +++ b/mkspecs/unsupported/qnx-X11-g++/qplatformdefs.h @@ -72,9 +72,6 @@ #include #include #include -#ifndef QT_NO_IPV6IFNAME -#include -#endif // for htonl #include diff --git a/src/corelib/kernel/qfunctions_vxworks.h b/src/corelib/kernel/qfunctions_vxworks.h index 34630a735b9..86f243959ff 100644 --- a/src/corelib/kernel/qfunctions_vxworks.h +++ b/src/corelib/kernel/qfunctions_vxworks.h @@ -62,9 +62,6 @@ #include #include #include -#ifndef QT_NO_IPV6IFNAME -#include -#endif // VxWorks has public header mbuf.h which defines following variables for DKM. // Let's undef those to because they overlap with Qt variable names- diff --git a/src/network/kernel/qnetworkinterface_unix.cpp b/src/network/kernel/qnetworkinterface_unix.cpp index afa6b4296ee..f8a33c395e0 100644 --- a/src/network/kernel/qnetworkinterface_unix.cpp +++ b/src/network/kernel/qnetworkinterface_unix.cpp @@ -56,6 +56,10 @@ #endif #include +#ifndef QT_NO_IPV6IFNAME +#include +#endif + #if defined(QT_LINUXBASE) # define QT_NO_GETIFADDRS #endif