merge from gcc

diff --git a/include/ChangeLog b/include/ChangeLog
index 257e381931feb1b1cd12f94ac121c9fbaea325c4..d7564ef9ef1df640eb178214b567604a98fb4f16 100644 (file)
--- a/include/ChangeLog
+++ b/include/ChangeLog
@@ -1,3 +1,7 @@
+2002-10-11  David O'Brien  <obrien@FreeBSD.org>
+
+       * getopt.h: getopt is in unistd.h (based on SUSv2).
+
 2002-09-26  Jakub Jelinek  <jakub@redhat.com>
 
        * elf/x86-64.h: Add TLS relocs.

diff --git a/include/getopt.h b/include/getopt.h
index 0c6470b3ddb9f1e12d1dff146b0a4b47bcb5818f..da09cee3be10d0bc69256940243f4132662e233a 100644 (file)
--- a/include/getopt.h
+++ b/include/getopt.h
@@ -108,7 +108,7 @@ 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