Skip to content

Commit a486250

Browse files
laruencesmalyshev
authored andcommitted
Fixed bug #64503 (Compilation fails with error: conflicting types for 'zendparse').
1 parent 4bad49e commit a486250

File tree

1 file changed

+7
-5
lines changed

1 file changed

+7
-5
lines changed

Zend/zend_language_parser.y

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,17 +41,19 @@ static YYSIZE_T zend_yytnamerr(char*, const char*);
4141

4242
#define YYERROR_VERBOSE
4343
#define YYSTYPE znode
44-
#ifdef ZTS
45-
# define YYPARSE_PARAM tsrm_ls
46-
# define YYLEX_PARAM tsrm_ls
47-
#endif
48-
4944

5045
%}
5146

5247
%pure_parser
5348
%expect 3
5449

50+
%code requires {
51+
#ifdef ZTS
52+
# define YYPARSE_PARAM tsrm_ls
53+
# define YYLEX_PARAM tsrm_ls
54+
#endif
55+
}
56+
5557
%token END 0 "end of file"
5658
%left T_INCLUDE T_INCLUDE_ONCE T_EVAL T_REQUIRE T_REQUIRE_ONCE
5759
%token T_INCLUDE "include (T_INCLUDE)"

0 commit comments

Comments
 (0)