Skip to content
Browse files

Merge branch 'PHP-5.5'

  • Loading branch information...
2 parents b6fa581 + 975d266 commit c356038c6eb1d970e716067aaf259c21131f963e @laruence laruence committed Mar 25, 2013
Showing with 7 additions and 5 deletions.
  1. +7 −5 Zend/zend_language_parser.y
View
12 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)"

0 comments on commit c356038

Please sign in to comment.
Something went wrong with that request. Please try again.