From 4a44bd6cdc3bc925f4fd335fd840c41a0a8e1a46 Mon Sep 17 00:00:00 2001
From: Thiago Macieira <thiago.macieira@intel.com>
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 <jake.petroules@qt.io>
---
 mkspecs/solaris-g++-64/qplatformdefs.h | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'mkspecs/solaris-g++-64/qplatformdefs.h')

diff --git a/mkspecs/solaris-g++-64/qplatformdefs.h b/mkspecs/solaris-g++-64/qplatformdefs.h
index 7504912a89..ae559183ff 100644
--- a/mkspecs/solaris-g++-64/qplatformdefs.h
+++ b/mkspecs/solaris-g++-64/qplatformdefs.h
@@ -73,9 +73,6 @@
 #include <sys/stat.h>
 #include <sys/wait.h>
 #include <netinet/in.h>
-#ifndef QT_NO_IPV6IFNAME
-#include <net/if.h>
-#endif
 
 #define QT_USE_XOPEN_LFS_EXTENSIONS
 #include "../common/posix/qplatformdefs.h"
-- 
cgit v1.2.3