From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sun, 25 May 2003 06:43:19 +0000 (+0000)
Subject: (YYSTACKEXPANDABLE): Do not evaluate
X-Git-Tag: BISON-2_0~300
X-Git-Url: https://git.saurik.com/bison.git/commitdiff_plain/f54526254746d9a19dacd9d1c0cac798776501d2

(YYSTACKEXPANDABLE): Do not evaluate
YYSTYPE_IS_TRIVIAL or YYSTYPE_IS_TRIVIAL unless they are defined.
This fixes a problem reported by John Bowman when the Compaq/HP
Alpha cxx compiler happy (e.g. using cxx -D__USE_STD_IOSTREAM
-ansi -Wall -gall).
---

diff --git a/data/glr.c b/data/glr.c
index d04edbd0..173d8c2d 100644
--- a/data/glr.c
+++ b/data/glr.c
@@ -510,7 +510,8 @@ int yydebug;
 
 #if (! defined (YYSTACKEXPANDABLE) \
      && (! defined (__cplusplus) \
-	 || (]b4_location_if([YYLTYPE_IS_TRIVIAL && ])[YYSTYPE_IS_TRIVIAL)))
+	 || (]b4_location_if([[defined (YYLTYPE_IS_TRIVIAL) && YYLTYPE_IS_TRIVIAL \
+	     && ]])[defined (YYSTYPE_IS_TRIVIAL) && YYSTYPE_IS_TRIVIAL)))
 #define YYSTACKEXPANDABLE 1
 #else
 #define YYSTACKEXPANDABLE 0