From: Zeev Suraski <zeev@php.net>
Date: Mon, 6 Dec 1999 15:31:06 +0000 (+0000)
Subject: Localize a couple of macros
X-Git-Tag: PRE_RETURN_REF_PATCH~32
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=00c3ac908b1f930160b1e2634a91f25b8e741d84;p=php

Localize a couple of macros
---

diff --git a/Zend/zend-parser.y b/Zend/zend-parser.y
index bd3e04026b..56f855ebb2 100644
--- 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 18748fdabb..2f099a0525 100644
--- 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 c3ce64e639..df739fd62b 100644
--- 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);