From f416dcd5bf3c2ce399cded62852b585acda4b6f8 Mon Sep 17 00:00:00 2001
From: Roger Sayle <roger@eyesopen.com>
Date: Sun, 27 Oct 2002 00:54:50 +0000
Subject: [PATCH] re PR bootstrap/8351 (3.3 20021024 (experimental) fails to
 bootstrap on cygwin)

	PR bootstrap/8351
	* getopt.h:  Avoid prototyping getopt with no arguments in C++.

Co-Authored-By: DJ Delorie <dj@redhat.com>

From-SVN: r58569
---
 include/ChangeLog | 6 ++++++
 include/getopt.h  | 2 ++
 2 files changed, 8 insertions(+)

diff --git a/include/ChangeLog b/include/ChangeLog
index 424b99790dc..70942c51168 100644
--- a/include/ChangeLog
+++ b/include/ChangeLog
@@ -1,3 +1,9 @@
+2002-10-26  Roger Sayle  <roger@eyesopen.com>
+	    DJ Delorie <dj@redhat.com>
+
+	PR bootstrap/8351
+	* getopt.h: Avoid prototyping getopt with no arguments in C++.
+
 2002-10-24  Nathan Tallent  <eraxxon@alumni.rice.edu>
 
 	* ansidecl.h (__STDC__): Add (__alpha && __cplusplus) to the
diff --git a/include/getopt.h b/include/getopt.h
index da09cee3be1..9495a4846fd 100644
--- a/include/getopt.h
+++ b/include/getopt.h
@@ -112,7 +112,9 @@ struct option
    errors, only prototype getopt for the GNU C library.  */
 extern int getopt (int argc, char *const *argv, const char *shortopts);
 #else
+#ifndef __cplusplus
 extern int getopt ();
+#endif /* __cplusplus */
 #endif
 #endif /* !HAVE_DECL_GETOPT */
 
-- 
2.30.2