From: Nick Clifton <nickc@redhat.com>
Date: Fri, 8 Apr 2011 15:28:47 +0000 (+0000)
Subject: 	* arlex.l: Prevent redefinition of YY_NO_UNPUT.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=894e93a83c10c0d408e2f2277ad6da8ea93ab3e9;p=binutils-gdb.git

	* arlex.l: Prevent redefinition of YY_NO_UNPUT.
	* syslex.l: Likewise.
---

diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index f2315f52990..4d3f46b0455 100644
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,8 @@
+2011-04-08  John Marino  <binutils@marino.st>
+
+	* arlex.l: Prevent redefinition of YY_NO_UNPUT.
+	* syslex.l: Likewise.
+
 2011-04-07  Paul Brook  <paul@codesourcery.com>
 
 	* readelf.c (arm_section_get_word): Handle C6000 relocations.
diff --git a/binutils/arlex.l b/binutils/arlex.l
index aeac3911ab1..4080580125d 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 7e3f29861ba..abfa6783767 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; }