aboutsummaryrefslogtreecommitdiffstats
path: root/ui
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2014-06-20 14:29:01 -0700
committerGuy Harris <guy@alum.mit.edu>2014-06-20 21:29:31 +0000
commit13b5d9b145a62db1f852008dfb6d42f79c52202f (patch)
tree65ecd02619060b87be3d8a1997ce07336d0b2314 /ui
parent9a50b0f20b496e448d3e6e924ea964b6dd2c7fca (diff)
Use OPTSTRING_CAPTURE_COMMON here as well.
Change-Id: If0078797a2e7b14edbd1b64863c4961c9b198168 Reviewed-on: https://code.wireshark.org/review/2494 Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'ui')
-rw-r--r--ui/gtk/main.c22
1 files changed, 3 insertions, 19 deletions
diff --git a/ui/gtk/main.c b/ui/gtk/main.c
index 8bc7fed661..8c9215ff45 100644
--- a/ui/gtk/main.c
+++ b/ui/gtk/main.c
@@ -2161,27 +2161,11 @@ main(int argc, char *argv[])
GtkosxApplication *theApp;
#endif
-#ifdef HAVE_LIBPCAP
-#if defined(_WIN32) || defined(HAVE_PCAP_CREATE)
-#define OPTSTRING_B "B:"
-#else
-#define OPTSTRING_B ""
-#endif /* _WIN32 or HAVE_PCAP_CREATE */
-#else /* HAVE_LIBPCAP */
-#define OPTSTRING_B ""
+#ifndef HAVE_LIBPCAP
+#define OPTSTRING_CAPTURE_COMMON ""
#endif /* HAVE_LIBPCAP */
-#ifdef HAVE_PCAP_REMOTE
-#define OPTSTRING_A "A:"
-#else
-#define OPTSTRING_A ""
-#endif
-#ifdef HAVE_PCAP_CREATE
-#define OPTSTRING_I "I"
-#else
-#define OPTSTRING_I ""
-#endif
-#define OPTSTRING "a:" OPTSTRING_A "b:" OPTSTRING_B "c:C:Df:g:Hhi:" OPTSTRING_I "jJ:kK:lLm:nN:o:P:pr:R:Ss:t:u:vw:X:y:Y:z:"
+#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;