PR c++/16597

[deliverable/binutils-gdb.git] / include / getopt.h

diff --git a/include/getopt.h b/include/getopt.h
index e5470e625fa5de9c5e3ab8a638ae6f1489551292..5421cabed82290ec9a17159e79a886108c929c74 100644 (file)
--- a/include/getopt.h
+++ b/include/getopt.h
@@ -17,7 +17,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 +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