Localize a couple of macros

diff --git a/Zend/zend-parser.y b/Zend/zend-parser.y
index bd3e04026bd27c56246aab32a45c90f1b12d4d5f..56f855ebb26efa02a40b1953d6103e9bba965a18 100644 (file)
--- a/Zend/zend-parser.y
+++ b/Zend/zend-parser.y
@@ -27,6 +27,12 @@
  * 
  */
 
+#define YYERROR_VERBOSE
+#define YYSTYPE znode
+#ifdef ZTS
+#define YYPARSE_PARAM compiler_globals
+#endif
+
 #include "zend_compile.h"
 #include "zend.h"
 #include "zend_list.h"
@@ -36,7 +42,6 @@
 #include "zend_operators.h"
 
 
-#define YYERROR_VERBOSE
 
 %}
 

diff --git a/Zend/zend_compile.h b/Zend/zend_compile.h
index 18748fdabb774c9e3fa3a554aeb7c5b7f3f4a554..2f099a052528b120629e21a7833b462775f7e88c 100644 (file)
--- a/Zend/zend_compile.h
+++ b/Zend/zend_compile.h
@@ -28,7 +28,6 @@
 #endif
 
 #include "zend_llist.h"
-#define YYSTYPE znode
 #include "zend-parser.h"
 
 #define DEBUG_ZEND 0

diff --git a/Zend/zend_globals_macros.h b/Zend/zend_globals_macros.h
index c3ce64e6399c572664e0576783eced6590dfe586..df739fd62b61e1552c573065e0b54b51a3367e48 100644 (file)
--- a/Zend/zend_globals_macros.h
+++ b/Zend/zend_globals_macros.h
@@ -33,7 +33,6 @@ typedef struct _zend_alloc_globals zend_alloc_globals;
 # define CLS_CC , CLS_C
 # define CG(v) (((zend_compiler_globals *) compiler_globals)->v)
 # define CLS_FETCH()   zend_compiler_globals *compiler_globals = (zend_compiler_globals *) ts_resource(compiler_globals_id)
-# define YYPARSE_PARAM compiler_globals
 # define YYLEX_PARAM compiler_globals
 BEGIN_EXTERN_C()
 int zendparse(void *compiler_globals);