From aa61a0bc07da61e0481789c71dd03290ea337872 Mon Sep 17 00:00:00 2001 From: blambert Date: Thu, 22 Jul 2010 19:31:53 +0000 Subject: [PATCH] getopt_long.c replaced getopt.c 6+ years ago; we can retire the REPLACE_GETOPT macro, at long last ok millert@ --- lib/libc/stdlib/getopt_long.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/lib/libc/stdlib/getopt_long.c b/lib/libc/stdlib/getopt_long.c index 73d97c0ed34..eb1e3ef4be5 100644 --- a/lib/libc/stdlib/getopt_long.c +++ b/lib/libc/stdlib/getopt_long.c @@ -1,4 +1,4 @@ -/* $OpenBSD: getopt_long.c,v 1.23 2007/10/31 12:34:57 chl Exp $ */ +/* $OpenBSD: getopt_long.c,v 1.24 2010/07/22 19:31:53 blambert Exp $ */ /* $NetBSD: getopt_long.c,v 1.15 2002/01/31 22:43:40 tv Exp $ */ /* @@ -55,15 +55,11 @@ #include #include -#define REPLACE_GETOPT /* use this getopt as the system getopt(3) */ - -#ifdef REPLACE_GETOPT int opterr = 1; /* if error message should be printed */ int optind = 1; /* index into parent argv vector */ int optopt = '?'; /* character checked for validity */ int optreset; /* reset getopt */ char *optarg; /* argument associated with option */ -#endif #define PRINT_ERROR ((opterr) && (*options != ':')) @@ -467,7 +463,6 @@ start: return (optchar); } -#ifdef REPLACE_GETOPT /* * getopt -- * Parse argc/argv argument vector. @@ -488,7 +483,6 @@ getopt(int nargc, char * const *nargv, const char *options) */ return (getopt_internal(nargc, nargv, options, NULL, NULL, 0)); } -#endif /* REPLACE_GETOPT */ /* * getopt_long -- -- 2.20.1