summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2001-09-18 15:05:20 +1000
committerDamien Miller <djm@mindrot.org>2001-09-18 15:05:20 +1000
commitff5f47e230b2c8278791c0fb8b2bcb0d08fcee1b (patch)
tree9d2673f5339f61631931224d55630952cee25edc
parentffbe69890dd16bb0dce24e401163cec731034e39 (diff)
downloadopenssh-git-ff5f47e230b2c8278791c0fb8b2bcb0d08fcee1b.tar.gz
- (djm) Avoid warning on BSDgetopt
-rw-r--r--ChangeLog5
-rw-r--r--openbsd-compat/getopt.h10
2 files changed, 8 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index 14bf5063..93a9852f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
20010918
- - (djm) Configure support for smartcards
+ - (djm) Configure support for smartcards. Based on Ben's work.
- (djm) Revert setgroups call, it causes problems on OS-X
+ - (djm) Avoid warning on BSDgetopt
20010917
- (djm) x11-ssh-askpass-1.2.4 in RPM spec, revert workarounds
@@ -6461,4 +6462,4 @@
- Wrote replacements for strlcpy and mkdtemp
- Released 1.0pre1
-$Id: ChangeLog,v 1.1526 2001/09/18 04:03:03 djm Exp $
+$Id: ChangeLog,v 1.1527 2001/09/18 05:05:20 djm Exp $
diff --git a/openbsd-compat/getopt.h b/openbsd-compat/getopt.h
index 08a4eb3e..9abdae8e 100644
--- a/openbsd-compat/getopt.h
+++ b/openbsd-compat/getopt.h
@@ -1,14 +1,14 @@
-/* $Id: getopt.h,v 1.3 2001/09/17 21:34:34 tim Exp $ */
+/* $Id: getopt.h,v 1.4 2001/09/18 05:05:21 djm Exp $ */
-#ifndef _GETOPT_H
-#define _GETOPT_H
+#ifndef _BSDGETOPT_H
+#define _BSDGETOPT_H
#include "config.h"
-#ifndef HAVE_GETOPT_H
+#if !defined(HAVE_GETOPT) || !defined(HAVE_GETOPT_OPTRESET)
int BSDgetopt(int argc, char * const *argv, const char *opts);
#endif
-#endif /* _GETOPT_H */
+#endif /* _BSDGETOPT_H */