From ca9da28eb9b81bd841668a8f2eef235ee8a575ee Mon Sep 17 00:00:00 2001 From: DJ Delorie Date: Sun, 27 Oct 2002 01:01:04 +0000 Subject: [PATCH] merge from gcc --- include/ChangeLog | 6 ++++++ include/getopt.h | 2 ++ 2 files changed, 8 insertions(+) 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 + DJ Delorie + + PR bootstrap/8351 + * getopt.h: Avoid prototyping getopt with no arguments in C++. + 2002-10-24 Nathan Tallent * 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 */ -- 2.7.4