diff options
Diffstat (limited to 'gtk')
| -rw-r--r-- | gtk/capture_dlg.c | 5 | ||||
| -rw-r--r-- | gtk/capture_if_details_dlg.c | 1 | ||||
| -rw-r--r-- | gtk/capture_if_dlg.c | 6 | ||||
| -rw-r--r-- | gtk/capture_info_dlg.c | 2 | ||||
| -rw-r--r-- | gtk/capture_prefs.c | 5 | ||||
| -rw-r--r-- | gtk/cfilter_combo_utils.c | 1 | ||||
| -rw-r--r-- | gtk/drag_and_drop.c | 4 | ||||
| -rw-r--r-- | gtk/main.c | 1 | ||||
| -rw-r--r-- | gtk/summary_dlg.c | 1 |
9 files changed, 6 insertions, 20 deletions
diff --git a/gtk/capture_dlg.c b/gtk/capture_dlg.c index 51f6b7351d..dc44a49f03 100644 --- a/gtk/capture_dlg.c +++ b/gtk/capture_dlg.c @@ -28,7 +28,6 @@ #ifdef HAVE_LIBPCAP -#include <pcap.h> #include <string.h> #include <gtk/gtk.h> @@ -159,7 +158,7 @@ set_link_type_list(GtkWidget *linktype_om, GtkWidget *entry) if_info_t *if_info; GList *lt_list; int err; - char err_buf[PCAP_ERRBUF_SIZE]; + char err_buf[CAPTURE_PCAP_ERRBUF_SIZE]; GtkWidget *lt_menu, *lt_menu_item; GList *lt_entry; data_link_info_t *data_link_info; @@ -525,7 +524,7 @@ capture_prep_cb(GtkWidget *w _U_, gpointer d _U_) GList *if_list, *combo_list, *cfilter_list; int err; int row; - char err_str[PCAP_ERRBUF_SIZE]; + char err_str[CAPTURE_PCAP_ERRBUF_SIZE]; gchar *cant_get_if_list_errstr; #ifdef _WIN32 GtkAdjustment *buffer_size_adj; diff --git a/gtk/capture_if_details_dlg.c b/gtk/capture_if_details_dlg.c index eda8b5c49b..02e9b06f3d 100644 --- a/gtk/capture_if_details_dlg.c +++ b/gtk/capture_if_details_dlg.c @@ -38,7 +38,6 @@ #include "globals.h" #include "file.h" -#include <pcap.h> #include "capture.h" #include "main.h" #include "dlg_utils.h" diff --git a/gtk/capture_if_dlg.c b/gtk/capture_if_dlg.c index 417f11eed9..17aa92732c 100644 --- a/gtk/capture_if_dlg.c +++ b/gtk/capture_if_dlg.c @@ -33,8 +33,6 @@ #endif -#include <pcap.h> - #include <gtk/gtk.h> #include "globals.h" @@ -160,7 +158,7 @@ capture_details_cb(GtkWidget *details_bt _U_, gpointer if_data) static void open_if(gchar *name, if_dlg_data_t *if_dlg_data) { - gchar open_err_str[PCAP_ERRBUF_SIZE]; + gchar open_err_str[CAPTURE_PCAP_ERRBUF_SIZE]; /* * XXX - on systems with BPF, the number of BPF devices limits the @@ -328,7 +326,7 @@ capture_if_cb(GtkWidget *w _U_, gpointer d _U_) #endif GtkTooltips *tooltips; int err; - char err_str[PCAP_ERRBUF_SIZE]; + char err_str[CAPTURE_PCAP_ERRBUF_SIZE]; gchar *cant_get_if_list_errstr; int row; if_dlg_data_t *if_dlg_data; diff --git a/gtk/capture_info_dlg.c b/gtk/capture_info_dlg.c index 6dd4feecef..e03e6f8151 100644 --- a/gtk/capture_info_dlg.c +++ b/gtk/capture_info_dlg.c @@ -30,7 +30,6 @@ #ifdef HAVE_LIBPCAP -#include <pcap.h> #include <gtk/gtk.h> #include "gtk/compat_macros.h" @@ -38,7 +37,6 @@ #include <epan/packet.h> #include "capture.h" -#include "capture_loop.h" #include "capture_info.h" #include "globals.h" #include "capture_ui_utils.h" diff --git a/gtk/capture_prefs.c b/gtk/capture_prefs.c index 403990169e..c17b75e053 100644 --- a/gtk/capture_prefs.c +++ b/gtk/capture_prefs.c @@ -28,7 +28,6 @@ #ifdef HAVE_LIBPCAP -#include <pcap.h> #include <string.h> #include <gtk/gtk.h> @@ -85,7 +84,7 @@ capture_prefs_show(void) GtkWidget *ifopts_lb, *ifopts_bt; GList *if_list, *combo_list; int err; - char err_str[PCAP_ERRBUF_SIZE]; + char err_str[CAPTURE_PCAP_ERRBUF_SIZE]; int row = 0; GtkTooltips *tooltips = gtk_tooltips_new(); @@ -695,7 +694,7 @@ ifopts_if_clist_add(void) { GList *if_list; int err; - char err_str[PCAP_ERRBUF_SIZE]; + char err_str[CAPTURE_PCAP_ERRBUF_SIZE]; gchar *cant_get_if_list_errstr; if_info_t *if_info; guint i; diff --git a/gtk/cfilter_combo_utils.c b/gtk/cfilter_combo_utils.c index ef0821ea79..9c184d3e26 100644 --- a/gtk/cfilter_combo_utils.c +++ b/gtk/cfilter_combo_utils.c @@ -34,7 +34,6 @@ #include "cfilter_combo_utils.h" #include "recent.h" #ifdef HAVE_LIBPCAP -#include <pcap.h> #endif /* XXX: use a preference for this setting! */ diff --git a/gtk/drag_and_drop.c b/gtk/drag_and_drop.c index d868de3e61..86471eee82 100644 --- a/gtk/drag_and_drop.c +++ b/gtk/drag_and_drop.c @@ -26,10 +26,6 @@ # include "config.h" #endif -#ifdef HAVE_LIBPCAP -#include <pcap.h> -#endif - #include <gtk/gtk.h> #include "globals.h" diff --git a/gtk/main.c b/gtk/main.c index aa03b5a950..4f07243c23 100644 --- a/gtk/main.c +++ b/gtk/main.c @@ -91,7 +91,6 @@ #include "merge.h" #ifdef HAVE_LIBPCAP -#include <pcap.h> #include "capture-pcap-util.h" #include "capture.h" #include "capture_sync.h" diff --git a/gtk/summary_dlg.c b/gtk/summary_dlg.c index d93bc8411f..cab8194c3d 100644 --- a/gtk/summary_dlg.c +++ b/gtk/summary_dlg.c @@ -36,7 +36,6 @@ #include "globals.h" #include "file.h" #ifdef HAVE_LIBPCAP -#include <pcap.h> #include "capture.h" #include "main.h" #endif |