diff options
| author | DJ Delorie <dj@redhat.com> | 2002-10-27 04:01:04 +0300 |
|---|---|---|
| committer | DJ Delorie <dj@redhat.com> | 2002-10-27 04:01:04 +0300 |
| commit | 238c78807d0a18a534724b6b2fd8a395bee9643b (patch) | |
| tree | 382b4c45a40a98b1a9158d2bc86cf555325e1578 | |
| parent | c3deee20b4f448b7e28362208506ccef0d59396d (diff) | |
merge from gcc
| -rw-r--r-- | include/ChangeLog | 6 | ||||
| -rw-r--r-- | include/getopt.h | 2 |
2 files changed, 8 insertions, 0 deletions
diff --git a/include/ChangeLog b/include/ChangeLog index dbbf4a406..bac0506f6 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 da09cee3b..9495a4846 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 */ |