aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDJ Delorie <dj@redhat.com>2002-10-27 01:01:04 +0000
committerDJ Delorie <dj@redhat.com>2002-10-27 01:01:04 +0000
commit238c78807d0a18a534724b6b2fd8a395bee9643b (patch)
tree382b4c45a40a98b1a9158d2bc86cf555325e1578
parentc3deee20b4f448b7e28362208506ccef0d59396d (diff)
downloadnewlib-238c78807d0a18a534724b6b2fd8a395bee9643b.zip
newlib-238c78807d0a18a534724b6b2fd8a395bee9643b.tar.gz
newlib-238c78807d0a18a534724b6b2fd8a395bee9643b.tar.bz2
merge from gcc
-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 dbbf4a4..bac0506 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 */