From 4a44bd6cdc3bc925f4fd335fd840c41a0a8e1a46 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Fri, 6 Oct 2017 21:30:48 -0700 Subject: 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 --- src/corelib/kernel/qfunctions_vxworks.h | 3 --- 1 file changed, 3 deletions(-) (limited to 'src/corelib/kernel') 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 #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- -- cgit v1.2.3