From ff5f47e230b2c8278791c0fb8b2bcb0d08fcee1b Mon Sep 17 00:00:00 2001
From: Damien Miller <djm@mindrot.org>
Date: Tue, 18 Sep 2001 15:05:20 +1000
Subject: [PATCH]  - (djm) Avoid warning on BSDgetopt

---
 ChangeLog               |  5 +++--
 openbsd-compat/getopt.h | 10 +++++-----
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 14bf50633..93a9852fe 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 08a4eb3e0..9abdae8e9 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 */