X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=include%2Fgetopt.h;h=a99a2290159a9d60cf28c4627cee8cbe28a62a97;hb=00c22daa1fec5c861e84cc6caa129e7c9a4d1b71;hp=0c6470b3ddb9f1e12d1dff146b0a4b47bcb5818f;hpb=2ee563b53258d390d7446e90a67f465d504ae44c;p=deliverable%2Fbinutils-gdb.git

diff --git a/include/getopt.h b/include/getopt.h
index 0c6470b3dd..a99a229015 100644
--- a/include/getopt.h
+++ b/include/getopt.h
@@ -1,6 +1,6 @@
 /* Declarations for getopt.
-   Copyright 1989, 1990, 1991, 1992, 1993, 1994, 1996, 1997, 1998, 2000
-   Free Software Foundation, Inc.
+   Copyright 1989, 1990, 1991, 1992, 1993, 1994, 1996, 1997, 1998, 2000,
+   2002 Free Software Foundation, Inc.
 
    NOTE: The canonical source of this file is maintained with the GNU C Library.
    Bugs can be reported to bug-glibc@gnu.org.
@@ -108,11 +108,13 @@ struct option
 #if !HAVE_DECL_GETOPT
 #if defined (__GNU_LIBRARY__) || defined (HAVE_DECL_GETOPT)
 /* Many other libraries have conflicting prototypes for getopt, with
-   differences in the consts, in stdlib.h.  To avoid compilation
+   differences in the consts, in unistd.h.  To avoid compilation
    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 */