summary refs log tree commit diff
path: root/intl
diff options
context:
space:
mode:
authorAndrea Monaco <andrea.monaco@autistici.org>2021-12-12 10:24:28 +0100
committerArjun Shankar <arjun@redhat.com>2021-12-22 14:46:39 +0100
commitc6d7d6312c21bbcfb236d48bb7c11cedb234389f (patch)
treed925a19f712eda759ea052d9a8ba6d98c9fd419d /intl
parent163f625cf9becbb82dfec63a29e566324129c0cd (diff)
downloadglibc-c6d7d6312c21bbcfb236d48bb7c11cedb234389f.tar.gz
glibc-c6d7d6312c21bbcfb236d48bb7c11cedb234389f.tar.xz
glibc-c6d7d6312c21bbcfb236d48bb7c11cedb234389f.zip
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>
Diffstat (limited to 'intl')
-rw-r--r--intl/plural.y5
1 files changed, 5 insertions, 0 deletions
diff --git a/intl/plural.y b/intl/plural.y
index e02e74541c..2ee128ba01 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}