diff options
| author | Xinchen Hui <laruence@php.net> | 2013-03-25 23:48:21 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2013-03-25 23:48:21 +0800 |
| commit | 975d26667bf7dbd0f4b739eca2e49d398105980a (patch) | |
| tree | 01b6ec822c7da8716ed7d474b1f1224cb80459e3 | |
| parent | c6e911e1549ba23158249ef1c0e6f27dcc6c88bb (diff) | |
| download | php-git-975d26667bf7dbd0f4b739eca2e49d398105980a.tar.gz | |
Fixed bug #64503 (Compilation fails with error: conflicting types for 'zendparse').
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | Zend/zend_language_parser.y | 12 |
2 files changed, 9 insertions, 5 deletions
@@ -3,6 +3,8 @@ PHP NEWS ?? ??? 20??, PHP 5.5.0 Beta 2 - Core: + . Fixed bug #64503 (Compilation fails with error: conflicting types for + 'zendparse'). (Laruence) . Fixed bug #64239 (Debug backtrace changed behavior since 5.4.10 or 5.4.11). (Dmitry, Laruence) diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y index ccbc9b174c..6a9a24a87e 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)" |