aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoger Sayle <roger@eyesopen.com>2002-10-27 00:54:50 +0000
committerRoger Sayle <sayle@gcc.gnu.org>2002-10-27 00:54:50 +0000
commitf416dcd5bf3c2ce399cded62852b585acda4b6f8 (patch)
tree5e3ada24f03a30ad8a8fc940a03f7dda5731d22f
parent980bccdd6f632dec6f518647266998d7d0c9f4c6 (diff)
downloadgcc-f416dcd5bf3c2ce399cded62852b585acda4b6f8.zip
gcc-f416dcd5bf3c2ce399cded62852b585acda4b6f8.tar.gz
gcc-f416dcd5bf3c2ce399cded62852b585acda4b6f8.tar.bz2
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
-rw-r--r--include/ChangeLog6
-rw-r--r--include/getopt.h2
2 files changed, 8 insertions, 0 deletions
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 */