1 files changed, 0 insertions, 26 deletions

diff --git a/ui/gtk/capture_dlg.c b/ui/gtk/capture_dlg.c
index 6a64c3a13d..798bc0e5b9 100644
--- a/ui/gtk/capture_dlg.c
+++ b/ui/gtk/capture_dlg.c
@@ -84,10 +84,8 @@
 #include "airpcap_dlg.h"
 #endif
 
-#ifdef HAVE_EXTCAP
 #include "extcap.h"
 #include "ui/gtk/extcap_gtk.h"
-#endif
 
 #include "globals.h"
 
@@ -175,10 +173,7 @@ enum
 #define E_CAP_N_RESOLVE_KEY             "cap_n_resolve"
 #define E_CAP_T_RESOLVE_KEY             "cap_t_resolve"
 #define E_CAP_E_RESOLVE_KEY             "cap_e_resolve"
-
-#ifdef HAVE_EXTCAP
 #define E_CAP_EXTCAP_KEY                "cap_extcap_vbox"
-#endif
 
 #define E_CAP_IFTYPE_CBX_KEY            "cap_iftype_cbx"
 #ifdef HAVE_PCAP_REMOTE
@@ -769,11 +764,9 @@ capture_all_filter_check_syntax_cb(GtkWidget *w _U_, gpointer user_data _U_)
         simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "The link type of interface %s was not specified.", device.name);
         continue;  /* Programming error: somehow managed to select an "unsupported" entry */
       }
-#ifdef HAVE_EXTCAP
       /* Can't verify extcap capture filters */
       if (device.if_info.extcap != NULL && strlen(device.if_info.extcap) > 0)
         continue;
-#endif
       filter_text = gtk_combo_box_text_get_active_text (GTK_COMBO_BOX_TEXT(filter_cm));
       if (strlen(filter_text) == 0) {
         colorize_filter_te_as_empty(filter_te);
@@ -2473,9 +2466,7 @@ save_options_cb(GtkWidget *win _U_, gpointer user_data _U_)
 #ifdef CAN_SET_CAPTURE_BUFFER_SIZE
   GtkWidget *buffer_size_sb;
 #endif
-#ifdef HAVE_EXTCAP
   GtkWidget *extcap_vbox = NULL;
-#endif
 
   interface_t device;
   gpointer   ptr = NULL;
@@ -2497,9 +2488,7 @@ save_options_cb(GtkWidget *win _U_, gpointer user_data _U_)
 
   linktype_combo_box = (GtkWidget *) g_object_get_data(G_OBJECT(opt_edit_w), E_CAP_LT_CBX_KEY);
 
-#ifdef HAVE_EXTCAP
   extcap_vbox  = (GtkWidget *) g_object_get_data(G_OBJECT(opt_edit_w), E_CAP_EXTCAP_KEY);
-#endif
 
   if (device.links != NULL) {
      if (ws_combo_box_get_active_pointer(GTK_COMBO_BOX(linktype_combo_box), &ptr)) {
@@ -2530,7 +2519,6 @@ save_options_cb(GtkWidget *win _U_, gpointer user_data _U_)
   g_assert(filter_text != NULL);
   device.cfilter = filter_text;
 
-#ifdef HAVE_EXTCAP
   if (device.external_cap_args_settings != NULL)
     g_hash_table_unref(device.external_cap_args_settings);
 
@@ -2541,7 +2529,6 @@ save_options_cb(GtkWidget *win _U_, gpointer user_data _U_)
 #if 0
   extcap_gtk_free_args(extcap_vbox);
 #endif
-#endif
 
 #ifdef HAVE_PCAP_CREATE
   /* if dumpcap reported that the interface does not support monitor
@@ -2579,8 +2566,6 @@ adjust_snap_sensitivity(GtkWidget *tb _U_, gpointer parent_w _U_)
   g_array_insert_val(global_capture_opts.all_ifaces, marked_interface, device);
 }
 
-#ifdef HAVE_EXTCAP
-
 static GtkWidget *build_extcap_options(const gchar *name, GHashTable *hash) {
   GtkWidget *ret_box = NULL;
   GList *arglist = NULL;
@@ -2602,7 +2587,6 @@ static GtkWidget *build_extcap_options(const gchar *name, GHashTable *hash) {
 
   return ret_box;
 }
-#endif
 
 /*
  * If we have an AirPcap "Wireless Settings" checkbox, have two columns
@@ -2648,9 +2632,7 @@ void options_interface_cb(GtkTreeView *view, GtkTreePath *path, GtkTreeViewColum
                   *compile_bt,
 #endif
                   *bbox, *ok_but, *cancel_bt,
-#ifdef HAVE_EXTCAP
                   *extcap_vbox,
-#endif
                   *help_bt;
 
   GList           *cf_entry, *list, *cfilter_list;
@@ -2676,9 +2658,7 @@ void options_interface_cb(GtkTreeView *view, GtkTreePath *path, GtkTreeViewColum
   GtkCellRenderer *renderer;
   GtkListStore    *store;
   const gchar     *new_cfilter;
-#ifdef HAVE_EXTCAP
   GHashTable      *extcap_hash;
-#endif
 
   window = (GtkWidget *)userdata;
   caller = gtk_widget_get_toplevel(GTK_WIDGET(window));
@@ -2706,9 +2686,7 @@ void options_interface_cb(GtkTreeView *view, GtkTreePath *path, GtkTreeViewColum
 #ifdef CAN_SET_CAPTURE_BUFFER_SIZE
   device.buffer = DEFAULT_CAPTURE_BUFFER_SIZE;
 #endif
-#ifdef HAVE_EXTCAP
   device.external_cap_args_settings = NULL;
-#endif
 
   model = gtk_tree_view_get_model(view);
   gtk_tree_model_get_iter (model, &iter, path);
@@ -3082,7 +3060,6 @@ void options_interface_cb(GtkTreeView *view, GtkTreePath *path, GtkTreeViewColum
   }
 #endif
 
-#ifdef HAVE_EXTCAP
   extcap_hash = device.external_cap_args_settings;
   extcap_vbox = build_extcap_options(device.name, extcap_hash);
   if (extcap_vbox != NULL) {
@@ -3090,7 +3067,6 @@ void options_interface_cb(GtkTreeView *view, GtkTreePath *path, GtkTreeViewColum
     gtk_widget_show(extcap_vbox);
   }
   g_object_set_data(G_OBJECT(opt_edit_w), E_CAP_EXTCAP_KEY, extcap_vbox);
-#endif
 
 /* Button row: "Start", "Cancel" and "Help" buttons */
   bbox = dlg_button_row_new(GTK_STOCK_OK, GTK_STOCK_CANCEL, GTK_STOCK_HELP, NULL);
@@ -3564,10 +3540,8 @@ add_pipe_cb(gpointer w _U_)
     device.if_info.addrs = NULL;
     device.if_info.loopback = FALSE;
     device.if_info.type = IF_PIPE;
-#ifdef HAVE_EXTCAP
     device.if_info.extcap = NULL;
     device.external_cap_args_settings = NULL;
-#endif
 #if defined(HAVE_PCAP_CREATE)
     device.monitor_mode_enabled   = FALSE;
     device.monitor_mode_supported = FALSE;