diff options
author | Guy Harris <guy@alum.mit.edu> | 2017-12-08 00:30:55 -0800 |
---|---|---|
committer | Guy Harris <guy@alum.mit.edu> | 2017-12-08 08:31:41 +0000 |
commit | 8aa14236f8b0ea69901ea9ed87ebabd0d278e973 (patch) | |
tree | b49b5d6b0ee5d647cf33054c5f280d2dc4fa4f99 /ui/gtk/main_filter_toolbar.c | |
parent | f29b3deb6d867b16fb8bc4bd5f66a5b6326a6727 (diff) |
Have the frame_tvbuff.c routines not use the global cfile.
Have the routines that create them take a pointer to a struct
packet_provider_data, store that in the tvbuff data, and use it to get
the wtap from which packets are being read.
While we're at it, don't include globals.h in any header files, and
include it in source files iff the source file actually uses cfile. Add
whatever includes that requires.
Change-Id: I9f1ee391f951dc427ff62c80f67aa4877a37c229
Reviewed-on: https://code.wireshark.org/review/24733
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'ui/gtk/main_filter_toolbar.c')
-rw-r--r-- | ui/gtk/main_filter_toolbar.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/ui/gtk/main_filter_toolbar.c b/ui/gtk/main_filter_toolbar.c index b555cd55c4..24b8c862d4 100644 --- a/ui/gtk/main_filter_toolbar.c +++ b/ui/gtk/main_filter_toolbar.c @@ -51,6 +51,8 @@ #include "main_filter_toolbar.h" #include "filter_expression_save_dlg.h" +#include "globals.h" + #define MENU_BAR_PATH_FILE_OPEN "/Menubar/FileMenu/Open" #define MENU_BAR_PATH_EDIT_COPY_AS_FLT "/Menubar/EditMenu/Copy/AsFilter" #define MENU_BAR_PATH_ANALYZE_DISPLAY_FLT "/Menubar/AnalyzeMenu/DisplayFilters" |