X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;ds=sidebyside;f=include%2Fgetopt.h;h=eca40f43a973ce0fa6dabd902123cf969acb1ae8;hb=873657b9e824943ae44c12966c29cbbcd21c986f;hp=e5470e625fa5de9c5e3ab8a638ae6f1489551292;hpb=80cf9aa47407322dbd84c404df57a12d511e599b;p=deliverable%2Fbinutils-gdb.git

diff --git a/include/getopt.h b/include/getopt.h
index e5470e625f..eca40f43a9 100644
--- a/include/getopt.h
+++ b/include/getopt.h
@@ -1,6 +1,5 @@
 /* Declarations for getopt.
-   Copyright 1989, 1990, 1991, 1992, 1993, 1994, 1996, 1997, 1998, 2000,
-   2002 Free Software Foundation, Inc.
+   Copyright (C) 1989-2020 Free Software Foundation, Inc.
 
    NOTE: The canonical source of this file is maintained with the GNU C Library.
    Bugs can be reported to bug-glibc@gnu.org.
@@ -17,7 +16,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301,
    USA.  */
 
 #ifndef _GETOPT_H
@@ -106,12 +105,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