From: Bruno Haible <bruno@clisp.org>
Date: Sat, 30 Sep 2023 18:49:13 +0000 (+0200)
Subject: intl: Merge from glibc.
X-Git-Tag: v0.23~340
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cb7f00e75b63b3e95b96d1d8e0969d245a954603;p=thirdparty%2Fgettext.git

intl: Merge from glibc.

Apply commit
2021-12-12  Andrea Monaco  <andrea.monaco@autistici.org>
intl/plural.y: Avoid conflicting declarations of yyerror and yylex
---

diff --git a/gettext-runtime/intl/plural.y b/gettext-runtime/intl/plural.y
index 858601be0..b3b3453f4 100644
--- a/gettext-runtime/intl/plural.y
+++ b/gettext-runtime/intl/plural.y
@@ -32,6 +32,11 @@
 # define __gettextparse PLURAL_PARSE
 #endif
 
+/* Later we provide those prototypes.  Without these macros, bison may
+   generate its own prototypes with possible conflicts.  */
+#define YYLEX_IS_DECLARED
+#define YYERROR_IS_DECLARED
+
 %}
 %require "3.0"
 %parse-param {struct parse_args *arg}