aboutsummaryrefslogtreecommitdiff
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
commitf1099ef345453ffedc12ec80268bf285f837cbf1 (patch)
tree1a00f02527f302b559a5c69fa2e001714e99d41e
parent80cf9aa47407322dbd84c404df57a12d511e599b (diff)
downloadgdb-f1099ef345453ffedc12ec80268bf285f837cbf1.zip
gdb-f1099ef345453ffedc12ec80268bf285f837cbf1.tar.gz
gdb-f1099ef345453ffedc12ec80268bf285f837cbf1.tar.bz2
Undo previous delta
-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 9eabc52..4c8d105 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 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