diff options
author | Dario Lombardo <lomato@gmail.com> | 2018-01-06 21:39:26 +0100 |
---|---|---|
committer | Anders Broman <a.broman58@gmail.com> | 2018-01-08 05:50:15 +0000 |
commit | e80b40adbe823be084fb49cd84336939916120bb (patch) | |
tree | d712734b953f7df6f1f79519c7abc73029152e1d /epan | |
parent | 6f93baced0fba7d07425e14ea698f4607964c6ed (diff) |
extcap: remove conditional compilation.
Change-Id: Ia54bba388755cf27a343fe6d69d244bf1ab897f9
Reviewed-on: https://code.wireshark.org/review/25186
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Roland Knall <rknall@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan')
-rw-r--r-- | epan/prefs.c | 4 | ||||
-rw-r--r-- | epan/prefs.h | 2 |
2 files changed, 0 insertions, 6 deletions
diff --git a/epan/prefs.c b/epan/prefs.c index b0ac5c8162..e44f47d0b5 100644 --- a/epan/prefs.c +++ b/epan/prefs.c @@ -2983,9 +2983,7 @@ prefs_register_modules(void) { module_t *printing, *capture_module, *console_module, *gui_layout_module, *gui_font_module; -#ifdef HAVE_EXTCAP module_t *extcap_module; -#endif struct pref_custom_cbs custom_cbs; @@ -2994,7 +2992,6 @@ prefs_register_modules(void) return; } -#ifdef HAVE_EXTCAP /* GUI * These are "simple" GUI preferences that can be read/written using the * preference module API. These preferences still use their own @@ -3010,7 +3007,6 @@ prefs_register_modules(void) "Save arguments on start of capture", "Save arguments on start of capture", &prefs.extcap_save_on_start); -#endif /* GUI * These are "simple" GUI preferences that can be read/written using the diff --git a/epan/prefs.h b/epan/prefs.h index 2eead89225..2eb7fbbfbd 100644 --- a/epan/prefs.h +++ b/epan/prefs.h @@ -245,9 +245,7 @@ typedef struct _e_prefs { gint st_sort_defcolflag; gboolean st_sort_defdescending; gboolean st_sort_showfullname; -#ifdef HAVE_EXTCAP gboolean extcap_save_on_start; -#endif } e_prefs; WS_DLL_PUBLIC e_prefs prefs; |