merge from gcc

2002-10-27 01:01:04 +00:00
parent c3deee20b4
commit 238c78807d
2 changed files with 8 additions and 0 deletions
--- 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 */