diff options
| author | Gerald Combs <gerald@wireshark.org> | 2012-08-04 00:01:59 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2012-08-04 00:01:59 +0000 |
| commit | b82eedf94a203c054c5940030fa6a9d7122b137c (patch) | |
| tree | 66dc14dabee1878137cdfe7ec90e0f662c513a14 /ui | |
| parent | a234d1215c9cc5787a2c91e3b89765ba7723094a (diff) | |
| download | wireshark-b82eedf94a203c054c5940030fa6a9d7122b137c.tar.gz | |
Make sure global_capture_opts is properly declared.
svn path=/trunk/; revision=44254
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/capture_globals.h | 8 | ||||
| -rw-r--r-- | ui/iface_lists.c | 1 | ||||
| -rw-r--r-- | ui/qt/main.cpp | 1 |
3 files changed, 10 insertions, 0 deletions
diff --git a/ui/capture_globals.h b/ui/capture_globals.h index 341b081a4b..1da90d22b6 100644 --- a/ui/capture_globals.h +++ b/ui/capture_globals.h @@ -25,6 +25,14 @@ #ifndef __CAPTURE_GLOBALS_H__ #define __CAPTURE_GLOBALS_H__ +#ifdef __cplusplus +extern "C" { +#endif /* __cplusplus */ + extern capture_options global_capture_opts; +#ifdef __cplusplus +} +#endif /* __cplusplus */ + #endif /* __CAPTURE_GLOBALS_H__ */ diff --git a/ui/iface_lists.c b/ui/iface_lists.c index d0352735f2..5f7887e717 100644 --- a/ui/iface_lists.c +++ b/ui/iface_lists.c @@ -38,6 +38,7 @@ #include "../capture_ui_utils.h" +#include "ui/capture_globals.h" #include "ui/iface_lists.h" capture_options global_capture_opts; diff --git a/ui/qt/main.cpp b/ui/qt/main.cpp index 4ee04e8657..b97686e659 100644 --- a/ui/qt/main.cpp +++ b/ui/qt/main.cpp @@ -83,6 +83,7 @@ #include <wsutil/file_util.h> #include "ui/alert_box.h" +#include "ui/capture_globals.h" #include "ui/iface_lists.h" #include "ui/main_statusbar.h" #include "ui/recent.h" |