diff options
| author | DJ Delorie <dj@redhat.com> | 2002-10-16 13:47:35 +0000 |
|---|---|---|
| committer | DJ Delorie <dj@redhat.com> | 2002-10-16 13:47:35 +0000 |
| commit | 6b67d752cc64875154cfccf227e1fb471e7688df (patch) | |
| tree | 27c0a6c35a994d594e229f14f5c66d6b3dcce91b | |
| parent | 207daf0f110590196a943f07c67d106dac11f659 (diff) | |
| download | newlib-6b67d752cc64875154cfccf227e1fb471e7688df.zip newlib-6b67d752cc64875154cfccf227e1fb471e7688df.tar.gz newlib-6b67d752cc64875154cfccf227e1fb471e7688df.tar.bz2 | |
merge from gcc
| -rw-r--r-- | include/ChangeLog | 4 | ||||
| -rw-r--r-- | include/getopt.h | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/include/ChangeLog b/include/ChangeLog index 257e381..d7564ef 100644 --- 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 0c6470b..da09cee 100644 --- 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 |