aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2010-05-14 01:39:02 +0000
committerGuy Harris <guy@alum.mit.edu>2010-05-14 01:39:02 +0000
commit8d56103f48aeb75e3a9be453eb15e03ece652890 (patch)
tree0a9bef2ddce85fdc6990af52a590fb6a9ed4986f
parent9307251bb8568c33b29a93b13fabcdaf8c7a1fe4 (diff)
Don't include capture-related headers if we don't support capturing
network traffic. svn path=/trunk/; revision=32802
-rw-r--r--gtk/main.c3
-rw-r--r--gtk/main_statusbar.c2
-rw-r--r--gtk/main_welcome.c10
3 files changed, 9 insertions, 6 deletions
diff --git a/gtk/main.c b/gtk/main.c
index b5c82a7c5e..183c8e84c3 100644
--- a/gtk/main.c
+++ b/gtk/main.c
@@ -102,12 +102,11 @@
#include "../version_info.h"
#include "../merge.h"
#include "../alert_box.h"
-#include "../capture_ui_utils.h"
#include "../log.h"
#include <wsutil/file_util.h>
-
#ifdef HAVE_LIBPCAP
+#include "../capture_ui_utils.h"
#include "../capture-pcap-util.h"
#include "../capture_ifinfo.h"
#include "../capture.h"
diff --git a/gtk/main_statusbar.c b/gtk/main_statusbar.c
index b89a5d980c..cca3a653a0 100644
--- a/gtk/main_statusbar.c
+++ b/gtk/main_statusbar.c
@@ -40,9 +40,9 @@
#include "../cfile.h"
#include "../file.h"
+#ifdef HAVE_LIBPCAP
#include "../capture_opts.h"
#include "../capture_ui_utils.h"
-#ifdef HAVE_LIBPCAP
#include "../capture.h"
#endif
diff --git a/gtk/main_welcome.c b/gtk/main_welcome.c
index 6a2d4accc3..3a72f55980 100644
--- a/gtk/main_welcome.c
+++ b/gtk/main_welcome.c
@@ -35,10 +35,12 @@
#include <epan/prefs.h>
#include "../color.h"
+#ifdef HAVE_LIBPCAP
#include "capture.h"
#include "capture-pcap-util.h"
#include "capture_opts.h"
#include "capture_ui_utils.h"
+#endif
#include "simple_dialog.h"
#include <wsutil/file_util.h>
@@ -49,12 +51,14 @@
#include "gtk/main.h"
#include "gtk/menus.h"
#include "gtk/main_welcome.h"
-#include "gtk/capture_dlg.h"
-#include "gtk/capture_if_dlg.h"
-#include "gtk/capture_file_dlg.h"
#include "gtk/help_dlg.h"
+#include "gtk/capture_file_dlg.h"
#include "gtk/stock_icons.h"
+#ifdef HAVE_LIBPCAP
+#include "gtk/capture_dlg.h"
+#include "gtk/capture_if_dlg.h"
#include "gtk/capture_globals.h"
+#endif
#include "../image/wssplash-dev.xpm"
#include "../version_info.h"