"capture-pcap-util.h" include <pcap.h>, and <pcap.h>, for better or

worse, has no include-once guards; include it only once. svn path=/trunk/; revision=32110
2010-03-04 07:19:43 +00:00 · 2010-03-04 07:19:43 +00:00 · 25d49313cc
parent b507e40fa7
commit 25d49313cc
3 changed files with 2 additions and 5 deletions
--- a/dumpcap.c
+++ b/dumpcap.c
@ -75,11 +75,10 @@
 #include "cmdarg_err.h"
 #include "version_info.h"

-#include <pcap.h>
-#include "pcapio.h"
-
 #include "capture-pcap-util.h"

+#include "pcapio.h"
+
 #ifdef _WIN32
 #include "capture-wpcap.h"
 #include <wsutil/unicode-utils.h>
--- a/rawshark.c
+++ b/rawshark.c
@ -107,7 +107,6 @@
 #include <wiretap/pcap-encap.h>

 #ifdef HAVE_LIBPCAP
-#include <pcap.h>
 #include <setjmp.h>
 #include "capture-pcap-util.h"
 #include "pcapio.h"
--- a/tshark.c
+++ b/tshark.c
@ -89,7 +89,6 @@

 #ifdef HAVE_LIBPCAP
 #include "capture_ui_utils.h"
-#include <pcap.h>
 #include "capture-pcap-util.h"
 #ifdef _WIN32
 #include "capture-wpcap.h"