Include "capture-pcap-util.h" even if we don't have libpcap.

The routines to get libpcap version information just say "no pcap here"
if we don't have it, so they're called regardless of whether we were
compiled with it.

Change-Id: I4e58cce83f7c0e36aa6ef9b40ec7075732402f3b
Reviewed-on: https://code.wireshark.org/review/2800
Reviewed-by: Guy Harris <guy@alum.mit.edu>
This commit is contained in:
Guy Harris 2014-07-03 02:16:12 -07:00
parent edc6736293
commit 1692c520ef
4 changed files with 8 additions and 4 deletions

View File

@ -111,9 +111,10 @@
#include <wsutil/clopts_common.h>
#include <wsutil/ws_version_info.h>
#include "capture-pcap-util.h"
#ifdef HAVE_LIBPCAP
#include <setjmp.h>
#include "capture-pcap-util.h"
#ifdef _WIN32
#include "capture-wpcap.h"
#endif /* _WIN32 */

View File

@ -104,9 +104,10 @@
#include "capture_opts.h"
#include "capture-pcap-util.h"
#ifdef HAVE_LIBPCAP
#include <capchild/capture_ifinfo.h>
#include "capture-pcap-util.h"
#ifdef _WIN32
#include "capture-wpcap.h"
#include <wsutil/unicode-utils.h>

View File

@ -130,8 +130,9 @@
#include "codecs/codecs.h"
#ifdef HAVE_LIBPCAP
#include "capture-pcap-util.h"
#ifdef HAVE_LIBPCAP
#include <capchild/capture_ifinfo.h>
#include "ui/capture.h"
#include <capchild/capture_sync.h>

View File

@ -105,8 +105,9 @@
#include "ui/simple_dialog.h"
#include "ui/ui_util.h"
#include "capture-pcap-util.h"
#ifdef HAVE_LIBPCAP
# include "capture-pcap-util.h"
# include <capchild/capture_ifinfo.h>
# include "ui/capture.h"
# include <capchild/capture_sync.h>