From c2c6b1701a110cbde5ff83c94dc0bf2286494081 Mon Sep 17 00:00:00 2001
From: Christopher Faylor <me@cgf.cx>
Date: Sun, 2 Mar 2003 22:52:18 +0000
Subject: [PATCH] * lib/getopt.c: Nuke use of unneeded BSDisms.

---
 winsup/cygwin/ChangeLog    |  4 ++++
 winsup/cygwin/lib/getopt.c | 11 +++--------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 5c5d53462..f81173f33 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,7 @@
+2003-03-02  Christopher Faylor  <cgf@redhat.com>
+
+	* lib/getopt.c: Nuke use of unneeded BSDisms.
+
 2003-03-02  Christopher Faylor  <cgf@redhat.com>
 
 	* dll_init.cc (dll_list::load_after_fork): Don't revert to LoadLibrary
diff --git a/winsup/cygwin/lib/getopt.c b/winsup/cygwin/lib/getopt.c
index 1a4439a1e..e5e1029d4 100644
--- a/winsup/cygwin/lib/getopt.c
+++ b/winsup/cygwin/lib/getopt.c
@@ -36,13 +36,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
-/*#include "namespace.h"*/
-
 #include <assert.h>
 #include <errno.h>
-/*#include <err.h>*/
 #include <stdlib.h>
 #include <string.h>
 #include <getopt.h>
@@ -92,9 +87,9 @@ extern char __declspec(dllimport) *__progname;
 
 #define	EMSG	""
 
-static int getopt_internal __P((int, char * const *, const char *));
-static int gcd __P((int, int));
-static void permute_args __P((int, int, int, char * const *));
+static int getopt_internal (int, char * const *, const char *);
+static int gcd (int, int);
+static void permute_args (int, int, int, char * const *);
 
 static const char *place = EMSG; /* option letter processing */