From 3bba2dadae2c76440018345bfd73f56452e6932d Mon Sep 17 00:00:00 2001 From: "Joel E. Denny" Date: Wed, 16 Dec 2009 01:41:17 -0500 Subject: [PATCH] * data/yacc.c: Reformat m4 a little. (cherry picked from commit 19750d310c1f21b72fc26d0b8905fac08d175130) --- ChangeLog | 4 ++++ data/yacc.c | 13 +++++++------ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index bfba2ea..bdf66b7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2009-12-16 Joel E. Denny + * data/yacc.c: Reformat m4 a little. + +2009-12-16 Joel E. Denny + Document gcc -Wundef fix. * NEWS (2.4.2): Here. * THANKS (Jonathan Nieder): Add. diff --git a/data/yacc.c b/data/yacc.c index a9815ee..25a7612 100644 --- a/data/yacc.c +++ b/data/yacc.c @@ -728,9 +728,9 @@ while (YYID (0)) YYRHSLOC (Rhs, 0).last_column; \ } \ while (YYID (0)) -#endif +#endif]b4_locations_if([[ + -]b4_locations_if([[ /* YY_LOCATION_PRINT -- Print the location on the stream. This macro was not mandated originally: define only if we know we won't break user code: when these are the locations we know. */ @@ -744,14 +744,15 @@ while (YYID (0)) # else # define YY_LOCATION_PRINT(File, Loc) ((void) 0) # endif -#endif -]], [[ +#endif]], [[ + + /* This macro is provided for backward compatibility. */ #ifndef YY_LOCATION_PRINT # define YY_LOCATION_PRINT(File, Loc) ((void) 0) -#endif -]])[ +#endif]])[ + /* YYLEX -- calling `yylex' with the right arguments. */ -- 2.7.4