From: guy <guy>
Date: Sun, 14 Dec 2008 20:30:11 +0000 (+0000)
Subject: It appears that, at least with the 2.6.27.5 kernel (and maybe the 2.6.27
X-Git-Tag: libpcap-1.1.0~216
X-Git-Url: https://git.tcpdump.org/libpcap/commitdiff_plain/080c13423a8f37f7b5e0964b6ff1cee2d1d83e0e?ds=sidebyside

It appears that, at least with the 2.6.27.5 kernel (and maybe the 2.6.27
kernel in general), <linux/wireless.h> includes <net/if.h> and you get
multiple-definition errors if you include <net/if.h> before it.  Only
include <net/if.h> if you don't have <linux/wireless.h>.
---

diff --git a/pcap-linux.c b/pcap-linux.c
index b2dcf926..e1145ab9 100644
--- a/pcap-linux.c
+++ b/pcap-linux.c
@@ -34,7 +34,7 @@
 
 #ifndef lint
 static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/libpcap/pcap-linux.c,v 1.162 2008-12-14 20:03:59 guy Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/libpcap/pcap-linux.c,v 1.163 2008-12-14 20:30:11 guy Exp $ (LBL)";
 #endif
 
 /*
@@ -93,19 +93,21 @@ static const char rcsid[] _U_ =
 #include <sys/ioctl.h>
 #include <sys/utsname.h>
 #include <sys/mman.h>
-#include <net/if.h>
-#include <netinet/in.h>
-#include <linux/if_ether.h>
-#include <net/if_arp.h>
-#include <poll.h>
 
 /*
  * Got Wireless Extensions?
  */
 #ifdef HAVE_LINUX_WIRELESS_H
 #include <linux/wireless.h>
+#else
+#include <net/if.h>
 #endif
 
+#include <netinet/in.h>
+#include <linux/if_ether.h>
+#include <net/if_arp.h>
+#include <poll.h>
+
 #include "pcap-int.h"
 #include "pcap/sll.h"
 #include "pcap/vlan.h"