From: Xinchen Hui <laruence@php.net>
Date: Mon, 25 Mar 2013 15:48:21 +0000 (+0800)
Subject: Fixed bug #64503 (Compilation fails with error: conflicting types for 'zendparse').
X-Git-Tag: php-5.5.6RC1~20^2~5^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7a79cf0206de62e61f3afe17e0665cb076a8a925;p=php

Fixed bug #64503 (Compilation fails with error: conflicting types for 'zendparse').
---

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)"