diff options
| author | Michał Łabędzki <michal.labedzki@wireshark.org> | 2018-05-20 10:24:59 +0200 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2018-05-21 12:05:26 +0000 |
| commit | bded74eb669a5d1789c2ea876e0044db17fe61e2 (patch) | |
| tree | 2f5335f094317d8651f003b975178427dd00c075 /epan/prefs.h | |
| parent | 95082052dac2c33404a38677290b2e5d22490dac (diff) | |
Do not use #if* in struct
Do not assume that somebody always includes "config.h" with "epan/prefs.h",
because I do not include that one and I notice a lot of bugs, like:
in one file sizeof(prefs) is 538 but in another is 544...
and of course preferences do not work as expected - order of fields
in the struct was changed. Try to avoid #if in struct.
Remove dependency of config.h for prefs by removing #ifs, because all prefs
should be registered also if not used.
Change-Id: I02f71d2e64acf3e0f90c802b1610cc4620727051
Reviewed-on: https://code.wireshark.org/review/27654
Petri-Dish: Michal Labedzki <michal.labedzki@wireshark.org>
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/prefs.h')
| -rw-r--r-- | epan/prefs.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/epan/prefs.h b/epan/prefs.h index 1c7ed99cf7..7f18f3ab18 100644 --- a/epan/prefs.h +++ b/epan/prefs.h @@ -175,18 +175,14 @@ typedef struct _e_prefs { layout_pane_content_e gui_layout_content_3; gchar *gui_interfaces_hide_types; gboolean gui_interfaces_show_hidden; -#ifdef HAVE_PCAP_REMOTE gboolean gui_interfaces_remote_display; -#endif gint console_log_level; gchar *capture_device; gchar *capture_devices_linktypes; gchar *capture_devices_descr; gchar *capture_devices_hide; gchar *capture_devices_monitor_mode; -#ifdef CAN_SET_CAPTURE_BUFFER_SIZE gchar *capture_devices_buffersize; -#endif gchar *capture_devices_snaplen; gchar *capture_devices_pmode; gchar *capture_devices_filter; /* XXX - Mostly unused. Deprecate? */ |