From 9f84ab0dcadd16a44d8585d013c597ab1c52aa8d Mon Sep 17 00:00:00 2001 From: DJ Delorie Date: Wed, 16 Oct 2002 13:47:35 +0000 Subject: [PATCH] merge from gcc --- include/ChangeLog | 4 ++++ include/getopt.h | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/include/ChangeLog b/include/ChangeLog index 257e381931f..d7564ef9ef1 100644 --- a/include/ChangeLog +++ b/include/ChangeLog @@ -1,3 +1,7 @@ +2002-10-11 David O'Brien + + * getopt.h: getopt is in unistd.h (based on SUSv2). + 2002-09-26 Jakub Jelinek * elf/x86-64.h: Add TLS relocs. diff --git a/include/getopt.h b/include/getopt.h index 0c6470b3ddb..da09cee3be1 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 -- 2.30.2