From: Michael Wallner <mike@php.net>
Date: Thu, 27 Feb 2020 09:37:44 +0000 (+0100)
Subject: csl: fix build with bison 2.3
X-Git-Tag: 1.1.0-beta1~250^2~12
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=db9fb0f9de0412cc5b757705fa19c9fa4dda8400;p=m6w6%2Flibmemcached

csl: fix build with bison 2.3
---

diff --git a/src/libmemcached/csl/common.h b/src/libmemcached/csl/common.h
index 667ac849..46a950a3 100644
--- a/src/libmemcached/csl/common.h
+++ b/src/libmemcached/csl/common.h
@@ -47,6 +47,12 @@
 typedef void* yyscan_t;
 #endif
 
+#ifndef YYSTYPE
+# define YYSTYPE union CONFIG_STYPE
+#endif
+
+#define config_tokentype int
+
 #include "libmemcached/common.h"
 #include "libmemcached/csl/server.h"
 
diff --git a/src/libmemcached/csl/parser.yy b/src/libmemcached/csl/parser.yy
index 8d2835a1..9dfb4a25 100644
--- a/src/libmemcached/csl/parser.yy
+++ b/src/libmemcached/csl/parser.yy
@@ -42,19 +42,20 @@ class Context;
 
 %}
 
-%define parse.error verbose
-%define api.pure
-%define api.prefix {config_}
-%define api.value.type {union CONFIG_STYPE}
+%require "2.3"
+
 %debug
-%defines
+%error-verbose
+%verbose
 %expect 0
+
+%pure-parser
+%name-prefix="config_"
+
 %lex-param { yyscan_t *scanner }
 %parse-param { class Context *context }
 %parse-param { yyscan_t *scanner }
-%require "2.5"
 %start begin
-%verbose
 
 %{