diff options
| author | Xinchen Hui <laruence@php.net> | 2013-03-25 23:48:21 +0800 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2013-08-19 11:18:51 -0700 |
| commit | a4862503d485abf449e0565ac03157d859a31bf7 (patch) | |
| tree | b43a7655ee1cdc3557bbd318e5b38a38842b2681 | |
| parent | 4bad49e3bcb8851b6bdf7ce8e8405a12d0eec6d0 (diff) | |
| download | php-git-a4862503d485abf449e0565ac03157d859a31bf7.tar.gz | |
Fixed bug #64503 (Compilation fails with error: conflicting types for 'zendparse').
| -rw-r--r-- | Zend/zend_language_parser.y | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y index 1f5d73296f..bf48bb73d9 100644 --- a/Zend/zend_language_parser.y +++ b/Zend/zend_language_parser.y @@ -41,17 +41,19 @@ static YYSIZE_T zend_yytnamerr(char*, const char*); #define YYERROR_VERBOSE #define YYSTYPE znode -#ifdef ZTS -# define YYPARSE_PARAM tsrm_ls -# define YYLEX_PARAM tsrm_ls -#endif - %} %pure_parser %expect 3 +%code requires { +#ifdef ZTS +# define YYPARSE_PARAM tsrm_ls +# define YYLEX_PARAM tsrm_ls +#endif +} + %token END 0 "end of file" %left T_INCLUDE T_INCLUDE_ONCE T_EVAL T_REQUIRE T_REQUIRE_ONCE %token T_INCLUDE "include (T_INCLUDE)" |