diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2017-10-06 21:30:48 -0700 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@intel.com> | 2017-10-08 06:41:24 +0000 |
| commit | 4a44bd6cdc3bc925f4fd335fd840c41a0a8e1a46 (patch) | |
| tree | 5c93c111a52e76b73c1727da4741ba2699f614b3 /src/network | |
| parent | ca49f133f0a0bcf62caf858a81325b0a9bf668c6 (diff) | |
Stop including net/if.h from qplatformdefs.h
I need to include linxx/if.h from elsewhere and these two files conflict
by defining the same types (struct ifreq, struct ifmap, struct ifconf,
etc.)
Change-Id: I0a103569c81b4711a649fffd14eb2f6dbbef83b6
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
Diffstat (limited to 'src/network')
| -rw-r--r-- | src/network/kernel/qnetworkinterface_unix.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/network/kernel/qnetworkinterface_unix.cpp b/src/network/kernel/qnetworkinterface_unix.cpp index afa6b4296e..f8a33c395e 100644 --- a/src/network/kernel/qnetworkinterface_unix.cpp +++ b/src/network/kernel/qnetworkinterface_unix.cpp @@ -56,6 +56,10 @@ #endif #include <net/if.h> +#ifndef QT_NO_IPV6IFNAME +#include <net/if.h> +#endif + #if defined(QT_LINUXBASE) # define QT_NO_GETIFADDRS #endif |