diff options
| author | Peter Wu <peter@lekensteyn.nl> | 2016-06-27 23:23:31 +0200 |
|---|---|---|
| committer | Peter Wu <peter@lekensteyn.nl> | 2016-06-27 22:40:56 +0000 |
| commit | e69194ae6513aa0bbf2728df09ec9133ae379714 (patch) | |
| tree | 8297a6ef20572f3de4f1d266d7f335caca42a391 /wireshark-qt.cpp | |
| parent | 4add8b6b4523db8966c88d69b7f9710859ec3081 (diff) | |
qt: fix linking error with global_capture_opts
global_capture_opts is already defined by ui/commandline.c which is also
linked with wireshark-qt.cpp. Remove the duplicate definition to avoid a
build failure with the gold linker.
Fixes regression from v2.1.1rc0-192-g9b5b444.
Change-Id: I4484e2769bf270dee1ec0378fd9c925e01eaf390
Reviewed-on: https://code.wireshark.org/review/16175
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Diffstat (limited to 'wireshark-qt.cpp')
| -rw-r--r-- | wireshark-qt.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/wireshark-qt.cpp b/wireshark-qt.cpp index 015706d5cc..1ab4f2eeca 100644 --- a/wireshark-qt.cpp +++ b/wireshark-qt.cpp @@ -124,10 +124,6 @@ #include <QTextCodec> #endif -#if defined(HAVE_LIBPCAP) || defined(HAVE_EXTCAP) -capture_options global_capture_opts; -#endif - /* update the main window */ void main_window_update(void) { |