diff options
| author | Zeev Suraski <zeev@php.net> | 2001-08-06 13:48:51 +0000 |
|---|---|---|
| committer | Zeev Suraski <zeev@php.net> | 2001-08-06 13:48:51 +0000 |
| commit | 609d58a4d6aa63dd7abaf2651cf40f4907b77c1e (patch) | |
| tree | 25fe6f56401a13587ef407ebb1eb96898d348c96 /Zend/zend_globals_macros.h | |
| parent | a35df189b8e6a580261e4cce0339b0f0d2a0d4c3 (diff) | |
| download | php-git-609d58a4d6aa63dd7abaf2651cf40f4907b77c1e.tar.gz | |
Merge from branch - move to standard C scanners in thread safe mode
Diffstat (limited to 'Zend/zend_globals_macros.h')
| -rw-r--r-- | Zend/zend_globals_macros.h | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/Zend/zend_globals_macros.h b/Zend/zend_globals_macros.h index e6c1343e9e..232bec1cf6 100644 --- a/Zend/zend_globals_macros.h +++ b/Zend/zend_globals_macros.h @@ -24,6 +24,7 @@ typedef struct _zend_compiler_globals zend_compiler_globals; typedef struct _zend_executor_globals zend_executor_globals; typedef struct _zend_alloc_globals zend_alloc_globals; +typedef struct _zend_scanner_globals zend_scanner_globals; /* Compiler */ #ifdef ZTS @@ -56,6 +57,26 @@ extern ZEND_API zend_alloc_globals alloc_globals; #endif +/* Language Scanner */ +#ifdef ZTS +# define LANG_SCNG(v) TSRMG(language_scanner_globals_id, zend_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; +#endif + + +/* INI Scanner */ +#ifdef ZTS +# define INI_SCNG(v) TSRMG(ini_scanner_globals_id, zend_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; +#endif + + /* For limited downwards source compatibility */ #define CLS_FETCH() #define ELS_FETCH() |