automatic import of glibcopeneuler22.03_LTS_SP4openeuler22.03_LTS_SP3openeuler20.03

1 files changed, 42 insertions, 0 deletions

diff --git a/intl-plural.y-Avoid-conflicting-declarations-of-yyer.patch b/intl-plural.y-Avoid-conflicting-declarations-of-yyer.patch
new file mode 100644
index 0000000..4931c9e
--- /dev/null
+++ b/intl-plural.y-Avoid-conflicting-declarations-of-yyer.patch
@@ -0,0 +1,42 @@
+From c6d7d6312c21bbcfb236d48bb7c11cedb234389f Mon Sep 17 00:00:00 2001
+From: Andrea Monaco <andrea.monaco@autistici.org>
+Date: Sun, 12 Dec 2021 10:24:28 +0100
+Subject: [PATCH] intl/plural.y: Avoid conflicting declarations of yyerror and
+ yylex
+
+bison-3.8 includes these lines in the generated intl/plural.c:
+
+  #if !defined __gettexterror && !defined YYERROR_IS_DECLARED
+  void __gettexterror (struct parse_args *arg, const char *msg);
+  #endif
+  #if !defined __gettextlex && !defined YYLEX_IS_DECLARED
+  int __gettextlex (YYSTYPE *yylvalp, struct parse_args *arg);
+  #endif
+
+Those default prototypes provided by bison conflict with the
+declarations later on in plural.y.  This patch solves the issue.
+
+Reviewed-by: Arjun Shankar <arjun@redhat.com>
+---
+ intl/plural.y | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/intl/plural.y b/intl/plural.y
+index e02e745..2ee128b 100644
+--- a/intl/plural.y
++++ b/intl/plural.y
+@@ -40,6 +40,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
++
+ %}
+ %parse-param {struct parse_args *arg}
+ %lex-param {struct parse_args *arg}
+-- 
+1.8.3.1
+