summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorNick Clifton <nickc@redhat.com>2005-03-23 14:49:45 +0000
committerNick Clifton <nickc@redhat.com>2005-03-23 14:49:45 +0000
commit03390127c7e005a1218886ac4afafdc35c1ed2f1 (patch)
treeaba852f16f1440f241803028b40dbcd1ec7c99b7 /include
parent7cb0acc18c9b867f1d7982cabc78ae3a1eaca212 (diff)
downloadbinutils-redhat-03390127c7e005a1218886ac4afafdc35c1ed2f1.tar.gz
Undo previous delta
Diffstat (limited to 'include')
-rw-r--r--include/ChangeLog5
-rw-r--r--include/getopt.h4
2 files changed, 1 insertions, 8 deletions
diff --git a/include/ChangeLog b/include/ChangeLog
index 9eabc52f4f..4c8d105093 100644
--- a/include/ChangeLog
+++ b/include/ChangeLog
@@ -1,8 +1,3 @@
-2005-03-23 Vladimir Merzliakov <wanderer@rsu.ru>
-
- * getopt.h (getopt): Allow full prototype when builind under
- FreeBSD.
-
2005-03-22 Kaveh R. Ghazi <ghazi@caip.rutgers.edu>
* libiberty.h (make_relative_prefix): Add ATTRIBUTE_MALLOC.
diff --git a/include/getopt.h b/include/getopt.h
index e5470e625f..a99a229015 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