Browse Source

fix for recent versions of bison

David Rose 23 years ago
parent
commit
ae0bf15799
2 changed files with 4 additions and 2 deletions
  1. 2 1
      dtool/src/cppparser/cppBisonDefs.h
  2. 2 1
      pandaapp/src/stitchbase/stitchParserDefs.h

+ 2 - 1
dtool/src/cppparser/cppBisonDefs.h

@@ -68,7 +68,7 @@ extern CPPPreprocessor *current_lexer;
 // union), so we'll use a class instead.  That means we need to
 // declare it externally, here.
 
-class YYSTYPE {
+class yystype {
 public:
   string str;
   union {
@@ -89,6 +89,7 @@ public:
     CPPIdentifier *identifier;
   } u;
 };
+#define YYSTYPE yystype
 
 // This structure takes advantage of a bison feature to track the
 // exact location in the file of each token, for more useful error

+ 2 - 1
pandaapp/src/stitchbase/stitchParserDefs.h

@@ -37,7 +37,7 @@ void stitch_init_parser(istream &in, const string &filename,
 // union), so we'll use a class instead.  That means we need to
 // declare it externally, here.
 
-class YYSTYPE {
+class yystype {
 public:
   double number;
   string str;
@@ -45,5 +45,6 @@ public:
   LVecBase4d vec;
   int num_components;
 };
+#define YYSTYPE yystype
 
 #endif