From 2233d10442f1e19d18693fc030aefe292b14cf29 Mon Sep 17 00:00:00 2001
From: Carl Worth <cworth@cworth.org>
Date: Wed, 28 Jul 2010 11:07:46 -0700
Subject: [PATCH] glcpp: Remove 2 shift/reduce conflicts from the grammar.

Since we have productions to turn "defined FOO" and "defined ( FOO )"
into a conditional_token we don't need to list DEFINED as an operator
as well. Doing so just introduces the shift/reduce ambiguity with no
benefit.
---
 src/glsl/glcpp/glcpp-parse.y | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/glsl/glcpp/glcpp-parse.y b/src/glsl/glcpp/glcpp-parse.y
index 5b74678..3322db0 100644
--- a/src/glsl/glcpp/glcpp-parse.y
+++ b/src/glsl/glcpp/glcpp-parse.y
@@ -478,7 +478,6 @@ operator:
 |	','			{ $$ = ','; }
 |	'='			{ $$ = '='; }
 |	PASTE			{ $$ = PASTE; }
-|	DEFINED			{ $$ = DEFINED; }
 ;
 
 %%
-- 
2.7.4