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.0beta2~9^2~3
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=975d26667bf7dbd0f4b739eca2e49d398105980a;p=php

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

diff --git a/NEWS b/NEWS
index 92e9c2bfe8..09ce1d1382 100644
--- a/NEWS
+++ b/NEWS
@@ -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)"