merge from gcc
This commit is contained in:
parent
c3deee20b4
commit
238c78807d
|
@ -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>
|
2002-10-24 Nathan Tallent <eraxxon@alumni.rice.edu>
|
||||||
|
|
||||||
* ansidecl.h (__STDC__): Add (__alpha && __cplusplus) to the
|
* ansidecl.h (__STDC__): Add (__alpha && __cplusplus) to the
|
||||||
|
|
|
@ -112,7 +112,9 @@ struct option
|
||||||
errors, only prototype getopt for the GNU C library. */
|
errors, only prototype getopt for the GNU C library. */
|
||||||
extern int getopt (int argc, char *const *argv, const char *shortopts);
|
extern int getopt (int argc, char *const *argv, const char *shortopts);
|
||||||
#else
|
#else
|
||||||
|
#ifndef __cplusplus
|
||||||
extern int getopt ();
|
extern int getopt ();
|
||||||
|
#endif /* __cplusplus */
|
||||||
#endif
|
#endif
|
||||||
#endif /* !HAVE_DECL_GETOPT */
|
#endif /* !HAVE_DECL_GETOPT */
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue