diff options
| author | foobar <sniper@php.net> | 2003-07-29 01:30:59 +0000 |
|---|---|---|
| committer | foobar <sniper@php.net> | 2003-07-29 01:30:59 +0000 |
| commit | c50fbaf69a5823871bd6b810c23f2569d4aef960 (patch) | |
| tree | faea5fb947e2b7e44680d0ee515b8866aefc0d5e /Zend/zend.c | |
| parent | 37ee0e57ccd77133a499499260fe87710fc0c46c (diff) | |
| download | php-git-c50fbaf69a5823871bd6b810c23f2569d4aef960.tar.gz | |
Remove the obfuscation caused by the double "#ifdef ZTS"
Diffstat (limited to 'Zend/zend.c')
| -rw-r--r-- | Zend/zend.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Zend/zend.c b/Zend/zend.c index 41fdd8a385..e3b5bc8a86 100644 --- a/Zend/zend.c +++ b/Zend/zend.c @@ -532,7 +532,6 @@ int zend_startup(zend_utility_functions *utility_functions, char **extensions, i zend_compiler_globals *compiler_globals; zend_executor_globals *executor_globals; void ***tsrm_ls; -#ifdef ZTS extern ZEND_API ts_rsrc_id ini_scanner_globals_id; extern ZEND_API ts_rsrc_id language_scanner_globals_id; #else @@ -540,6 +539,7 @@ int zend_startup(zend_utility_functions *utility_functions, char **extensions, i extern zend_scanner_globals language_scanner_globals; #endif +#ifdef ZTS ts_allocate_id(&alloc_globals_id, sizeof(zend_alloc_globals), (ts_allocate_ctor) alloc_globals_ctor, (ts_allocate_dtor) alloc_globals_dtor); #else alloc_globals_ctor(&alloc_globals TSRMLS_CC); |