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/corelib | |
| 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/corelib')
| -rw-r--r-- | src/corelib/kernel/qfunctions_vxworks.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/corelib/kernel/qfunctions_vxworks.h b/src/corelib/kernel/qfunctions_vxworks.h index 34630a735b..86f243959f 100644 --- a/src/corelib/kernel/qfunctions_vxworks.h +++ b/src/corelib/kernel/qfunctions_vxworks.h @@ -62,9 +62,6 @@ #include <sys/stat.h> #include <sys/wait.h> #include <netinet/in.h> -#ifndef QT_NO_IPV6IFNAME -#include <net/if.h> -#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- |