- 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. svn path=/trunk/; revision=13648
This commit is contained in:
parent
8de6e67f08
commit
58d8f2f652
|
@ -22,6 +22,8 @@
|
|||
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
*/
|
||||
|
||||
/* This file should only be included if libpcap is present */
|
||||
|
||||
#ifndef __CAPTURE_H__
|
||||
#define __CAPTURE_H__
|
||||
|
||||
|
@ -29,8 +31,6 @@
|
|||
* Capture related things.
|
||||
*/
|
||||
|
||||
#ifdef HAVE_LIBPCAP
|
||||
|
||||
/** Name we give to the child process when doing a "-S" capture. */
|
||||
#define CHILD_NAME "ethereal-capture"
|
||||
|
||||
|
@ -156,6 +156,4 @@ extern void capture_info_destroy(
|
|||
capture_info *cinfo);
|
||||
|
||||
|
||||
#endif /* HAVE_LIBPCAP */
|
||||
|
||||
#endif /* capture.h */
|
||||
|
|
|
@ -37,7 +37,7 @@
|
|||
#include <time.h>
|
||||
|
||||
#include <epan/packet.h>
|
||||
#include "../capture.h"
|
||||
#include "capture.h"
|
||||
#include "globals.h"
|
||||
#include "capture_ui_utils.h"
|
||||
#include "dlg_utils.h"
|
||||
|
|
10
gtk/main.c
10
gtk/main.c
|
@ -30,10 +30,6 @@
|
|||
# include "config.h"
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_LIBPCAP
|
||||
#include <pcap.h>
|
||||
#endif
|
||||
|
||||
#include <gtk/gtk.h>
|
||||
|
||||
#include <string.h>
|
||||
|
@ -91,14 +87,18 @@
|
|||
#include "util.h"
|
||||
#include "clopts_common.h"
|
||||
#include "version_info.h"
|
||||
#include "capture.h"
|
||||
#include "merge.h"
|
||||
|
||||
#ifdef HAVE_LIBPCAP
|
||||
#include <pcap.h>
|
||||
#include "pcap-util.h"
|
||||
#include "capture.h"
|
||||
#endif
|
||||
|
||||
#ifdef _WIN32
|
||||
#include "capture-wpcap.h"
|
||||
#endif
|
||||
|
||||
#if GTK_MAJOR_VERSION < 2 && GTK_MINOR_VERSION < 3
|
||||
#include "ethclist.h"
|
||||
#endif
|
||||
|
|
|
@ -36,6 +36,7 @@
|
|||
#include "globals.h"
|
||||
#include "file.h"
|
||||
#ifdef HAVE_LIBPCAP
|
||||
#include <pcap.h>
|
||||
#include "capture.h"
|
||||
#include "main.h"
|
||||
#endif
|
||||
|
|
|
@ -26,6 +26,7 @@
|
|||
#define __SUMMARY_H__
|
||||
|
||||
#ifdef HAVE_LIBPCAP
|
||||
#include <pcap.h>
|
||||
#include "capture.h"
|
||||
#endif
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue