6c82cf3dec
Upstream commit: 2fe2af88abd13ae5636881da2e26f461ecb7dfb5 - i386: Remove broken CAN_USE_REGISTER_ASM_EBP (bug 28771) - Update syscall lists for Linux 5.15 - powerpc: Fix unrecognized instruction errors with recent GCC - timezone: test-case for BZ #28707 - timezone: handle truncated timezones from tzcode-2021d and later (BZ #28707) - Fix subscript error with odd TZif file [BZ #28338] - AArch64: Check for SVE in ifuncs [BZ #28744] - intl/plural.y: Avoid conflicting declarations of yyerror and yylex - Linux: Fix 32-bit vDSO for clock_gettime on powerpc32 - linux: Add sparck brk implementation - Update sparc libm-test-ulps - Update hppa libm-test-ulps - riscv: align stack before calling _dl_init [BZ #28703] - riscv: align stack in clone [BZ #28702] - powerpc64[le]: Allocate extra stack frame on syscall.S - elf: Fix tst-cpu-features-cpuinfo for KVM guests on some AMD systems [BZ #28704] - nss: Use "files dns" as the default for the hosts database (bug 28700) - arm: Guard ucontext _rtld_global_ro access by SHARED, not PIC macro - mips: increase stack alignment in clone to match the ABI - mips: align stack in clone [BZ #28223]
38 lines
1.3 KiB
Diff
38 lines
1.3 KiB
Diff
commit 41fddc064ded5c9a36d8ffaad59a85407a22a535
|
|
Author: Andrea Monaco <andrea.monaco@autistici.org>
|
|
Date: Sun Dec 12 10:24:28 2021 +0100
|
|
|
|
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>
|
|
(cherry picked from commit c6d7d6312c21bbcfb236d48bb7c11cedb234389f)
|
|
|
|
diff --git a/intl/plural.y b/intl/plural.y
|
|
index e02e74541c4574eb..2ee128ba01b5820d 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}
|