diff options
| author | Michael Mann <mmann78@netscape.net> | 2015-12-16 23:15:03 -0500 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2015-12-19 14:22:56 +0000 |
| commit | 444dfda793784cecda0757cbe50e27a5ba855ba0 (patch) | |
| tree | ec34e5780c2dbe29bc2f170c2fc406ee20aa0430 /ui/capture_globals.h | |
| parent | 7baac67149a68b66087c5d688dbeda2869485765 (diff) | |
| download | wireshark-444dfda793784cecda0757cbe50e27a5ba855ba0.tar.gz | |
Allow "capture info data" to not be a singleton.
It was buried as a static variable in capture_info.c, and functions were refactored to allow a pointer to the info_data_t structure to be passed in. TShark and GTK will have their own single (global) copy of the structure, while it opens up Qt to have multiple instances.
Change-Id: Ic2d7a2ad574de43f457cb18b194d6bc3fffb6120
Reviewed-on: https://code.wireshark.org/review/12691
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'ui/capture_globals.h')
| -rw-r--r-- | ui/capture_globals.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/ui/capture_globals.h b/ui/capture_globals.h index d7b9e77542..916bd37516 100644 --- a/ui/capture_globals.h +++ b/ui/capture_globals.h @@ -23,7 +23,7 @@ #ifndef __CAPTURE_GLOBALS_H__ #define __CAPTURE_GLOBALS_H__ -#include <capchild/capture_session.h> +#include "capture_opts.h" #ifdef __cplusplus extern "C" { @@ -31,8 +31,6 @@ extern "C" { extern capture_options global_capture_opts; -extern capture_session global_capture_session; - #ifdef __cplusplus } #endif /* __cplusplus */ |