From 894e93a83c10c0d408e2f2277ad6da8ea93ab3e9 Mon Sep 17 00:00:00 2001 From: Nick Clifton Date: Fri, 8 Apr 2011 15:28:47 +0000 Subject: * arlex.l: Prevent redefinition of YY_NO_UNPUT. * syslex.l: Likewise. --- binutils/ChangeLog | 5 +++++ binutils/arlex.l | 6 ++++-- binutils/syslex.l | 4 +++- 3 files changed, 12 insertions(+), 3 deletions(-) (limited to 'binutils') diff --git a/binutils/ChangeLog b/binutils/ChangeLog index f2315f5..4d3f46b 100644 --- a/binutils/ChangeLog +++ b/binutils/ChangeLog @@ -1,3 +1,8 @@ +2011-04-08 John Marino + + * arlex.l: Prevent redefinition of YY_NO_UNPUT. + * syslex.l: Likewise. + 2011-04-07 Paul Brook * readelf.c (arm_section_get_word): Handle C6000 relocations. diff --git a/binutils/arlex.l b/binutils/arlex.l index aeac391..4080580 100644 --- a/binutils/arlex.l +++ b/binutils/arlex.l @@ -3,7 +3,7 @@ %{ /* arlex.l - Strange script language lexer */ -/* Copyright 1992, 1997, 2000, 2001, 2002, 2003, 2004, 2005, 2007 +/* Copyright 1992, 1997, 2000, 2001, 2002, 2003, 2004, 2005, 2007, 2011 Free Software Foundation, Inc. This file is part of GNU Binutils. @@ -31,8 +31,10 @@ #include "libiberty.h" #include "arparse.h" +#ifndef YY_NO_UNPUT #define YY_NO_UNPUT - +#endif + extern int yylex (void); int linenumber; diff --git a/binutils/syslex.l b/binutils/syslex.l index 7e3f298..abfa678 100644 --- a/binutils/syslex.l +++ b/binutils/syslex.l @@ -1,7 +1,7 @@ %option noinput nounput %{ -/* Copyright 2001, 2003, 2005, 2007 Free Software Foundation, Inc. +/* Copyright 2001, 2003, 2005, 2007, 2011 Free Software Foundation, Inc. This file is part of GNU Binutils. @@ -30,7 +30,9 @@ #endif #include "sysinfo.h" +#ifndef YY_NO_UNPUT #define YY_NO_UNPUT +#endif #ifndef yywrap static int yywrap (void) { return 1; } -- cgit v1.1