From: sayle <sayle@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Sun, 27 Oct 2002 00:54:50 +0000 (+0000)
Subject: 	PR bootstrap/8351
X-Git-Tag: upstream/4.9.2~83687
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4a1587e6f52fb79d2128ff78d6566a9bfd4bdcad;p=platform%2Fupstream%2Flinaro-gcc.git

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


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@58569 138bc75d-0d04-0410-961f-82ee72b054a4
---

diff --git a/include/ChangeLog b/include/ChangeLog
index 424b997..70942c5 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 da09cee..9495a48 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 */