diff options
| author | Zeev Suraski <zeev@php.net> | 1999-12-06 15:31:06 +0000 |
|---|---|---|
| committer | Zeev Suraski <zeev@php.net> | 1999-12-06 15:31:06 +0000 |
| commit | 00c3ac908b1f930160b1e2634a91f25b8e741d84 (patch) | |
| tree | 30ba78dce19066878d83084105de117a19bff518 | |
| parent | 5df43c134f6793d9364fd1c877ae57e9a110ad04 (diff) | |
| download | php-git-00c3ac908b1f930160b1e2634a91f25b8e741d84.tar.gz | |
Localize a couple of macros
| -rw-r--r-- | Zend/zend-parser.y | 7 | ||||
| -rw-r--r-- | Zend/zend_compile.h | 1 | ||||
| -rw-r--r-- | Zend/zend_globals_macros.h | 1 |
3 files changed, 6 insertions, 3 deletions
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); |