Merge remote-tracking branch 'origin/branch-2.6' into maint

[bison.git] / data / glr.c

diff --git a/data/glr.c b/data/glr.c
index a2992e089e9bd0171a7c8961bdb874bbd73ecd80..9bd95228da6e0615a627d416f338f7b6b54a1e4e 100644 (file)
--- a/data/glr.c
+++ b/data/glr.c
@@ -226,8 +226,8 @@ b4_percent_code_get([[top]])[
    right-hand sides.  Unlike the standard yacc.c template, here we set
    the default value of $$ to a zeroed-out value.  Since the default
    value is undefined, this behavior is technically correct.  */
    right-hand sides.  Unlike the standard yacc.c template, here we set
    the default value of $$ to a zeroed-out value.  Since the default
    value is undefined, this behavior is technically correct.  */

-static YYSTYPE yyval_default;]b4_locations_if([
-b4_yyloc_default_define])[
+static YYSTYPE yyval_default;]b4_locations_if([[
+static YYLTYPE yyloc_default][]b4_yyloc_default;])[

 
 /* Copy the second part of user declarations.  */
 ]b4_user_post_prologue
 
 /* Copy the second part of user declarations.  */
 ]b4_user_post_prologue