aboutsummaryrefslogtreecommitdiffstats
path: root/tethereal.c
diff options
context:
space:
mode:
authorjmayer <jmayer@f5534014-38df-0310-8fa8-9805f1628bb7>2005-03-07 10:19:33 +0000
committerjmayer <jmayer@f5534014-38df-0310-8fa8-9805f1628bb7>2005-03-07 10:19:33 +0000
commit190fb3ee1c53ccaefa016e2f371355cbe7335315 (patch)
treeffbd3755463443abb63104664cdd1ddf643ebed2 /tethereal.c
parent8d5037de6c2785034384204ffe02ee9a20811e33 (diff)
- pcap.h needs to be included before capture.h
- As capture.h is empty without libpcap defined, only include it in that case and don't protect the file internally against libpcap any more. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@13648 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'tethereal.c')
-rw-r--r--tethereal.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/tethereal.c b/tethereal.c
index 3d05d1a386..ef6e5cd2af 100644
--- a/tethereal.c
+++ b/tethereal.c
@@ -86,9 +86,6 @@
#include "util.h"
#include "clopts_common.h"
#include "version_info.h"
-#ifdef HAVE_LIBPCAP
-#include "pcap-util.h"
-#endif
#include <epan/conversation.h>
#include <epan/plugins.h>
#include "register.h"
@@ -101,6 +98,8 @@
#include <epan/timestamp.h>
#ifdef HAVE_LIBPCAP
+#include <pcap.h>
+#include "pcap-util.h"
#include <wiretap/wtap-capture.h>
#include <wiretap/libpcap.h>
#ifdef _WIN32