[Mesa-stable] [PATCH] mesa/program: remove useless YYID

Chad Versace chad.versace at linux.intel.com
Fri Aug 16 10:51:49 PDT 2013


From: Laurent Carlier <lordheavym at gmail.com>

This fixes the build with Bison 3.0. Also works with Bison 2.7.1.

CC: "9.2" <mesa-stable at lists.freedesktop.org>
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
(cherry picked from commit 5ffa28df4e4cc22481b4ed41c78632f35765f41d)
---

Fixes 9.2 build with new Bison.

This patch is ready for `git am`, with cherry-pick annotation already in place.


 src/mesa/program/program_parse.y | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/mesa/program/program_parse.y b/src/mesa/program/program_parse.y
index 3aceb21..a76db4e 100644
--- a/src/mesa/program/program_parse.y
+++ b/src/mesa/program/program_parse.y
@@ -98,7 +98,7 @@ static struct asm_instruction *asm_instruction_copy_ctor(
 
 #define YYLLOC_DEFAULT(Current, Rhs, N)					\
    do {									\
-      if (YYID(N)) {							\
+      if (N) {							\
 	 (Current).first_line = YYRHSLOC(Rhs, 1).first_line;		\
 	 (Current).first_column = YYRHSLOC(Rhs, 1).first_column;	\
 	 (Current).position = YYRHSLOC(Rhs, 1).position;		\
@@ -112,7 +112,7 @@ static struct asm_instruction *asm_instruction_copy_ctor(
 	 (Current).position = YYRHSLOC(Rhs, 0).position			\
 	    + (Current).first_column;					\
       }									\
-   } while(YYID(0))
+   } while(0)
 %}
 
 %pure-parser
-- 
1.8.3.1



More information about the mesa-stable mailing list