diff options
| author | krakjoe <joe.watkins@live.co.uk> | 2014-09-20 20:22:14 +0100 |
|---|---|---|
| committer | krakjoe <joe.watkins@live.co.uk> | 2014-09-20 20:22:14 +0100 |
| commit | b3aebda9eaf55706af2e21178f229a171725a168 (patch) | |
| tree | 9aa1794dc4b513d5c0077adcbeb89fa215f181a4 /Zend/zend_globals_macros.h | |
| parent | 763bfb4f3b0e66d5a961f9f367aa86e9f9da262e (diff) | |
| download | php-git-b3aebda9eaf55706af2e21178f229a171725a168.tar.gz | |
native tls initial patch
Diffstat (limited to 'Zend/zend_globals_macros.h')
| -rw-r--r-- | Zend/zend_globals_macros.h | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/Zend/zend_globals_macros.h b/Zend/zend_globals_macros.h index ac9b793775..67b5b66317 100644 --- a/Zend/zend_globals_macros.h +++ b/Zend/zend_globals_macros.h @@ -32,13 +32,16 @@ BEGIN_EXTERN_C() /* Compiler */ #ifdef ZTS # define CG(v) TSRMG(compiler_globals_id, zend_compiler_globals *, v) -int zendparse(void *compiler_globals); #else # define CG(v) (compiler_globals.v) extern ZEND_API struct _zend_compiler_globals compiler_globals; -int zendparse(void); #endif +#ifdef PASS_TSRMLS +int zendparse(void *compiler_globals); +#else +int zend_parse(void); +#endif /* Executor */ #ifdef ZTS @@ -51,7 +54,7 @@ extern ZEND_API zend_executor_globals executor_globals; /* Language Scanner */ #ifdef ZTS # define LANG_SCNG(v) TSRMG(language_scanner_globals_id, zend_php_scanner_globals *, v) -extern ZEND_API ts_rsrc_id language_scanner_globals_id; +TSRMG_DH(zend_php_scanner_globals, language_scanner_globals_id); #else # define LANG_SCNG(v) (language_scanner_globals.v) extern ZEND_API zend_php_scanner_globals language_scanner_globals; @@ -61,7 +64,7 @@ extern ZEND_API zend_php_scanner_globals language_scanner_globals; /* INI Scanner */ #ifdef ZTS # define INI_SCNG(v) TSRMG(ini_scanner_globals_id, zend_ini_scanner_globals *, v) -extern ZEND_API ts_rsrc_id ini_scanner_globals_id; +TSRMG_DH(zend_ini_scanner_globals, ini_scanner_globals_id); #else # define INI_SCNG(v) (ini_scanner_globals.v) extern ZEND_API zend_ini_scanner_globals ini_scanner_globals; |