(yystype) [defined YYSTYPE]: Define to YYSTYPE, not to our own type.

diff --git a/data/lalr1.cc b/data/lalr1.cc
index fdd8c2598b282ce9395aecab39234d08c18f4ee0..200f42d20307386fd9132489255b4e294744b9af 100644 (file)
--- a/data/lalr1.cc
+++ b/data/lalr1.cc
@@ -161,7 +161,9 @@ b4_syncline([@oline@], [@ofile@])[
 # define YYERROR_VERBOSE ]b4_error_verbose[
 #endif
 
 # define YYERROR_VERBOSE ]b4_error_verbose[
 #endif
 

-#ifndef YYSTYPE
+#ifdef YYSTYPE
+typedef YYSTYPE yystype;
+#else

 ]m4_ifdef([b4_stype],
 [b4_syncline([b4_stype_line], [b4_filename])
 typedef union b4_stype yystype;
 ]m4_ifdef([b4_stype],
 [b4_syncline([b4_stype_line], [b4_filename])
 typedef union b4_stype yystype;