summaryrefslogtreecommitdiffstats
path: root/mkspecs/common/android
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@intel.com>2017-10-06 21:30:48 -0700
committerThiago Macieira <thiago.macieira@intel.com>2017-10-08 06:41:24 +0000
commit4a44bd6cdc3bc925f4fd335fd840c41a0a8e1a46 (patch)
tree5c93c111a52e76b73c1727da4741ba2699f614b3 /mkspecs/common/android
parentca49f133f0a0bcf62caf858a81325b0a9bf668c6 (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 'mkspecs/common/android')
-rw-r--r--mkspecs/common/android/qplatformdefs.h4
1 files changed, 0 insertions, 4 deletions
diff --git a/mkspecs/common/android/qplatformdefs.h b/mkspecs/common/android/qplatformdefs.h
index 048eb47c6c..23180c5d3c 100644
--- a/mkspecs/common/android/qplatformdefs.h
+++ b/mkspecs/common/android/qplatformdefs.h
@@ -70,10 +70,6 @@
#include <sys/stat.h>
#include <sys/wait.h>
-#ifndef QT_NO_IPV6IFNAME
-#include <net/if.h>
-#endif
-
#ifndef _GNU_SOURCE
# define _GNU_SOURCE
#endif