Undo previous delta

diff --git a/include/ChangeLog b/include/ChangeLog
index 9eabc52f4fa96d71b08dce48c4f57665b7c85166..4c8d105093ee5933810d3bb13e80e0e5f8319e27 100644 (file)
--- 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 e5470e625fa5de9c5e3ab8a638ae6f1489551292..a99a2290159a9d60cf28c4627cee8cbe28a62a97 100644 (file)
--- 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