From 1ae06d1a5a633a9efe7544a671f1885e00320094 Mon Sep 17 00:00:00 2001 From: Marco d'Itri Date: Sat, 13 Sep 2014 04:42:33 +0200 Subject: [PATCH] Move longopts into main() --- whois.c | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/whois.c b/whois.c index 66277f4..c36ffd2 100644 --- a/whois.c +++ b/whois.c @@ -71,23 +71,25 @@ int hide_discl = HIDE_DISABLED; const char *client_tag = IDSTRING; -#ifdef HAVE_GETOPT_LONG -static const struct option longopts[] = { - {"version", no_argument, NULL, 1 }, - {"verbose", no_argument, NULL, 2 }, - {"help", no_argument, NULL, 3 }, - {"server", required_argument, NULL, 'h'}, - {"host", required_argument, NULL, 'h'}, - {"port", required_argument, NULL, 'p'}, - {NULL, 0, NULL, 0 } -}; -#else +#ifndef HAVE_GETOPT_LONG extern char *optarg; extern int optind; #endif int main(int argc, char *argv[]) { +#ifdef HAVE_GETOPT_LONG + const struct option longopts[] = { + {"version", no_argument, NULL, 1 }, + {"verbose", no_argument, NULL, 2 }, + {"help", no_argument, NULL, 3 }, + {"server", required_argument, NULL, 'h'}, + {"host", required_argument, NULL, 'h'}, + {"port", required_argument, NULL, 'p'}, + {NULL, 0, NULL, 0 } + }; +#endif + int ch, nopar = 0, fstringlen = 64; const char *server = NULL, *port = NULL; char *qstring, *fstring;