From: Matthew Fernandez <matthew.fernandez@gmail.com>
Date: Wed, 2 Sep 2020 01:47:32 +0000 (-0700)
Subject: remove incorrect EXSTYPE redefinition
X-Git-Tag: 2.46.0~20^2^2~92^2~5
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bb740f2e0884cc191f90a18568411fb25d3abfe8;p=graphviz

remove incorrect EXSTYPE redefinition

Bison's -pPREFIX -- which, incidentally, this parser is not using -- does *not*
miss YYSTYPE. Upcoming changes expose that this detrimentally interferes with
attempts to properly prefix the expr parser. Related to #1806.
---

diff --git a/lib/expr/expr.h b/lib/expr/expr.h
index 6ed431602..78bac3107 100644
--- a/lib/expr/expr.h
+++ b/lib/expr/expr.h
@@ -37,19 +37,6 @@ extern "C" {
 #define extern		extern __IMPORT__
 #endif
 
-/*
- * bison -pPREFIX misses YYSTYPE
- */
-
-#if defined(YYSTYPE) || defined(YYBISON)
-#define EXSTYPE		YYSTYPE
-#else
-#include <exparse.h>
-#if defined(YYSTYPE) || defined(yystype)
-#define EXSTYPE		YYSTYPE
-#endif
-#endif
-
 #include "exparse.h"
 
 #undef	extern