merge from gcc

diff --git a/include/ChangeLog b/include/ChangeLog
index dbbf4a4..bac0506 100644 (file)
--- 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 (file)
--- 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 */