diff options
| author | Guy Harris <guy@alum.mit.edu> | 2014-06-20 16:26:11 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2014-06-20 23:26:46 +0000 |
| commit | 235d3a2a3a62bd6e4667a8e2b32ee351b0569352 (patch) | |
| tree | 50a9f55f0e339067a17af5e3e9755eb6bcbf7c16 | |
| parent | 5d65e022dfea12e1b2235e03b2505993755100cb (diff) | |
Fix build without pcap.
The files that use LONGOPT_CAPTURE_COMMON and OPTSTRING_CAPTURE_COMMON
include capture_opts.h unconditionally, so there's no need to define
them if we don't have pcap. In addition, we want the capture options
"available" even if we don't have pcap, so we can tell the user "you're
using a version of *shark without pcap, but you gave a capture option".
Change-Id: I0bd3893b73d3d903610d0bc6cacb60bfb37096f4
Reviewed-on: https://code.wireshark.org/review/2503
Reviewed-by: Guy Harris <guy@alum.mit.edu>
| -rw-r--r-- | tshark.c | 5 | ||||
| -rw-r--r-- | ui/gtk/main.c | 4 | ||||
| -rw-r--r-- | ui/qt/main.cpp | 5 |
3 files changed, 0 insertions, 14 deletions
@@ -915,11 +915,6 @@ show_version(GString *comp_info_str, GString *runtime_info_str) runtime_info_str->str); } -#ifndef HAVE_LIBPCAP -#define LONGOPT_CAPTURE_COMMON -#define OPTSTRING_CAPTURE_COMMON "" -#endif /* HAVE_LIBPCAP */ - int main(int argc, char *argv[]) { diff --git a/ui/gtk/main.c b/ui/gtk/main.c index 8c9215ff45..0e05e40256 100644 --- a/ui/gtk/main.c +++ b/ui/gtk/main.c @@ -2161,10 +2161,6 @@ main(int argc, char *argv[]) GtkosxApplication *theApp; #endif -#ifndef HAVE_LIBPCAP -#define OPTSTRING_CAPTURE_COMMON "" -#endif /* HAVE_LIBPCAP */ - #define OPTSTRING OPTSTRING_CAPTURE_COMMON "C:g:Hh" "jJ:kK:lm:nN:o:P:r:R:St:u:vw:X:Y:z:" static const char optstring[] = OPTSTRING; diff --git a/ui/qt/main.cpp b/ui/qt/main.cpp index 68a385dbc7..f061f77063 100644 --- a/ui/qt/main.cpp +++ b/ui/qt/main.cpp @@ -499,11 +499,6 @@ int main(int argc, char *argv[]) // XXX Should the remaining code be in WiresharkApplcation::WiresharkApplication? -#ifndef HAVE_LIBPCAP -#define LONGOPT_CAPTURE_COMMON -#define OPTSTRING_CAPTURE_COMMON "" -#endif /* HAVE_LIBPCAP */ - #define OPTSTRING OPTSTRING_CAPTURE_COMMON "C:g:Hh" "jJ:kK:lm:nN:o:P:Qr:R:St:u:vw:X:z:" static const struct option long_options[] = { {(char *)"help", no_argument, NULL, 'h'}, |