diff options
| author | Marcus Boerger <helly@php.net> | 2008-03-16 21:06:55 +0000 |
|---|---|---|
| committer | Marcus Boerger <helly@php.net> | 2008-03-16 21:06:55 +0000 |
| commit | af316021e8f69896cd0d246114962e48b973972f (patch) | |
| tree | 7bf0e294155631040c03c6b76ab3b96dce967b94 /Zend/zend_globals_macros.h | |
| parent | eb8f83a98e7fbfa206601fa5016cc211eb78e024 (diff) | |
| download | php-git-af316021e8f69896cd0d246114962e48b973972f.tar.gz | |
- Rewrite scanner to be based on re2c instead of flex
The full patch is available as:
http://php.net/~helly/php-re2c-5.3-20080316.diff.txt
This is against php-re2c repository version 98
An older patch against version 97 is available under:
http://php.net/~helly/php-re2c-97-20080316.diff.txt
Diffstat (limited to 'Zend/zend_globals_macros.h')
| -rw-r--r-- | Zend/zend_globals_macros.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/Zend/zend_globals_macros.h b/Zend/zend_globals_macros.h index d04d00b996..8ddfef4a58 100644 --- a/Zend/zend_globals_macros.h +++ b/Zend/zend_globals_macros.h @@ -24,7 +24,8 @@ typedef struct _zend_compiler_globals zend_compiler_globals; typedef struct _zend_executor_globals zend_executor_globals; -typedef struct _zend_scanner_globals zend_scanner_globals; +typedef struct _zend_php_scanner_globals zend_php_scanner_globals; +typedef struct _zend_ini_scanner_globals zend_ini_scanner_globals; BEGIN_EXTERN_C() @@ -49,21 +50,21 @@ extern ZEND_API zend_executor_globals executor_globals; /* Language Scanner */ #ifdef ZTS -# define LANG_SCNG(v) TSRMG(language_scanner_globals_id, zend_scanner_globals *, v) +# define LANG_SCNG(v) TSRMG(language_scanner_globals_id, zend_php_scanner_globals *, v) extern ZEND_API ts_rsrc_id language_scanner_globals_id; #else # define LANG_SCNG(v) (language_scanner_globals.v) -extern ZEND_API zend_scanner_globals language_scanner_globals; +extern ZEND_API zend_php_scanner_globals language_scanner_globals; #endif /* INI Scanner */ #ifdef ZTS -# define INI_SCNG(v) TSRMG(ini_scanner_globals_id, zend_scanner_globals *, v) +# define INI_SCNG(v) TSRMG(ini_scanner_globals_id, zend_ini_scanner_globals *, v) extern ZEND_API ts_rsrc_id ini_scanner_globals_id; #else # define INI_SCNG(v) (ini_scanner_globals.v) -extern ZEND_API zend_scanner_globals ini_scanner_globals; +extern ZEND_API zend_ini_scanner_globals ini_scanner_globals; #endif END_EXTERN_C() |