mirror/glibc
2
0
Fork 0
mirror of git://sourceware.org/git/glibc.git synced 2024-11-21 01:12:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

intl/plural.y: Avoid conflicting declarations of yyerror and yylex

Browse Source 
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>
This commit is contained in:
Andrea Monaco 2021-12-12 10:24:28 +01:00 committed by Arjun Shankar
parent 163f625cf9
commit c6d7d6312c
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
intl/plural.y
View File

@ -40,6 +40,11 @@
# define __gettextparse PLURAL_PARSE # define __gettextparse PLURAL_PARSE
#endif #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} %parse-param {struct parse_args *arg}
%lex-param {struct parse_args *arg} %lex-param {struct parse_args *arg}