summaryrefslogtreecommitdiff
path: root/pkgtools/libnbcompat
diff options
context:
space:
mode:
authorjoerg <joerg@pkgsrc.org>2009-04-14 17:34:41 +0000
committerjoerg <joerg@pkgsrc.org>2009-04-14 17:34:41 +0000
commit1cde2cc7fdc28c5011e9c62d00ee59902640656a (patch)
tree009546750ed6d7837c6bb61850cade1f7ea24c2e /pkgtools/libnbcompat
parent4e5876739e84e5bc9646ca0c65368415d9ba853e (diff)
downloadpkgsrc-1cde2cc7fdc28c5011e9c62d00ee59902640656a.tar.gz
Always declare optreset.
XXX optreset should be removed here, it can't be used correctly with a GNU getopt_long implementation without touching the environment.
Diffstat (limited to 'pkgtools/libnbcompat')
-rw-r--r--pkgtools/libnbcompat/files/getopt_long.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/pkgtools/libnbcompat/files/getopt_long.c b/pkgtools/libnbcompat/files/getopt_long.c
index 84fe1b3b739..fab9ecfc6e5 100644
--- a/pkgtools/libnbcompat/files/getopt_long.c
+++ b/pkgtools/libnbcompat/files/getopt_long.c
@@ -1,4 +1,4 @@
-/* $NetBSD: getopt_long.c,v 1.10 2009/03/22 22:33:13 joerg Exp $ */
+/* $NetBSD: getopt_long.c,v 1.11 2009/04/14 17:34:41 joerg Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
#include <nbcompat.h>
#include <nbcompat/cdefs.h>
-__RCSID("$NetBSD: getopt_long.c,v 1.10 2009/03/22 22:33:13 joerg Exp $");
+__RCSID("$NetBSD: getopt_long.c,v 1.11 2009/04/14 17:34:41 joerg Exp $");
#if 0
#include "namespace.h"
@@ -66,10 +66,10 @@ __weak_alias(getopt,_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 */
-#elif HAVE_NBTOOL_CONFIG_H && !HAVE_DECL_OPTRESET
-int optreset;
+#endif
+#if !HAVE_DECL_OPTRESET
+int optreset; /* reset getopt */
#endif
#if 0