merge from gcc

This commit is contained in:
DJ Delorie 2002-10-16 13:47:35 +00:00
parent 4001ad8ce4
commit 9f84ab0dca
2 changed files with 5 additions and 1 deletions

View File

@ -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> 2002-09-26 Jakub Jelinek <jakub@redhat.com>
* elf/x86-64.h: Add TLS relocs. * elf/x86-64.h: Add TLS relocs.

View File

@ -108,7 +108,7 @@ struct option
#if !HAVE_DECL_GETOPT #if !HAVE_DECL_GETOPT
#if defined (__GNU_LIBRARY__) || defined (HAVE_DECL_GETOPT) #if defined (__GNU_LIBRARY__) || defined (HAVE_DECL_GETOPT)
/* Many other libraries have conflicting prototypes for getopt, with /* 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. */ 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