]> granicus.if.org Git - php/commitdiff
Remove the obfuscation caused by the double "#ifdef ZTS"
authorfoobar <sniper@php.net>
Tue, 29 Jul 2003 01:30:59 +0000 (01:30 +0000)
committerfoobar <sniper@php.net>
Tue, 29 Jul 2003 01:30:59 +0000 (01:30 +0000)
Zend/zend.c

index 41fdd8a385d699206a82dd9684c5bf724b57c562..e3b5bc8a867aacd3c0b1d331c362863245d88e21 100644 (file)
@@ -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);