com php-src: Fixed bug #64503 (Compilation fails with error: conflicting types for 'zendparse').: Zend/zend_language_parser.y

From: Date: Mon, 19 Aug 2013 18:18:51 +0000
Subject: com php-src: Fixed bug #64503 (Compilation fails with error: conflicting types for 'zendparse').: Zend/zend_language_parser.y
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-72996@lists.php.net to get a copy of this message
Commit: a4862503d485abf449e0565ac03157d859a31bf7 Author: Xinchen Hui <laruence@php.net> Mon, 25 Mar 2013 23:48:21 +0800 Committer: Stanislav Malyshev <stas@php.net> Mon, 19 Aug 2013 11:18:51 -0700 Parents: 4bad49e3bcb8851b6bdf7ce8e8405a12d0eec6d0 Branches: PHP-5.4 PHP-5..5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=a4862503d485abf449e0565ac03157d859a31bf7 Log: Fixed bug #64503 (Compilation fails with error: conflicting types for 'zendparse'). Bugs: https://bugs.php.net/64503 Changed paths: M Zend/zend_language_parser.y Diff: diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y index 1f5d732..bf48bb7 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)"

« previous php.cvs (#72996) next »