From f1099ef345453ffedc12ec80268bf285f837cbf1 Mon Sep 17 00:00:00 2001 From: Nick Clifton Date: Wed, 23 Mar 2005 14:49:45 +0000 Subject: [PATCH] Undo previous delta --- include/ChangeLog | 5 ----- include/getopt.h | 4 +--- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/include/ChangeLog b/include/ChangeLog index 9eabc52..4c8d105 100644 --- a/include/ChangeLog +++ b/include/ChangeLog @@ -1,8 +1,3 @@ -2005-03-23 Vladimir Merzliakov - - * getopt.h (getopt): Allow full prototype when builind under - FreeBSD. - 2005-03-22 Kaveh R. Ghazi * libiberty.h (make_relative_prefix): Add ATTRIBUTE_MALLOC. diff --git a/include/getopt.h b/include/getopt.h index e5470e6..a99a229 100644 --- a/include/getopt.h +++ b/include/getopt.h @@ -106,12 +106,10 @@ struct option to find the declaration so provide a fully prototyped one. If it is 1, we found it so don't provide any declaration at all. */ #if !HAVE_DECL_GETOPT -#if defined (__GNU_LIBRARY__) || defined (HAVE_DECL_GETOPT) || defined (__FreeBSD__) #if defined (__GNU_LIBRARY__) || defined (HAVE_DECL_GETOPT) /* Many other libraries have conflicting prototypes for getopt, with differences in the consts, in unistd.h. To avoid compilation - errors, only prototype getopt for environments where we know that - there will ben o conflicts. */ + errors, only prototype getopt for the GNU C library. */ extern int getopt (int argc, char *const *argv, const char *shortopts); #else #ifndef __cplusplus -- 2.7.4