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 858601be0379bb5c7fac45f10fde1e467cbc783b..b3b3453f4f171552a47867c10e0759e3f4e81cbd 100644 (file)
--- 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}