diff options
| author | Andi Gutmans <andi@php.net> | 2000-03-16 21:23:24 +0000 |
|---|---|---|
| committer | Andi Gutmans <andi@php.net> | 2000-03-16 21:23:24 +0000 |
| commit | 1bcdb436c176885a071046c78e84ace8396e7a25 (patch) | |
| tree | b33bcd9006c062d46f24f75892d1875e40dad120 | |
| parent | 2a3fdcb73d666b772b494f00a8cdc07f3c33b914 (diff) | |
| download | php-git-1bcdb436c176885a071046c78e84ace8396e7a25.tar.gz | |
- Note quite sure why this wasn't done.
| -rw-r--r-- | main/SAPI.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/main/SAPI.c b/main/SAPI.c index 50289d5daf..bb20de383d 100644 --- a/main/SAPI.c +++ b/main/SAPI.c @@ -57,14 +57,11 @@ SAPI_API int sapi_globals_id; sapi_globals_struct sapi_globals; #endif -#ifdef ZTS static void sapi_globals_ctor(sapi_globals_struct *sapi_globals) { memset(sapi_globals,0,sizeof(*sapi_globals)); } -#endif - /* True globals (no need for thread safety) */ sapi_module_struct sapi_module; SAPI_API void (*sapi_error)(int error_type, const char *message, ...); @@ -79,7 +76,10 @@ SAPI_API void sapi_startup(sapi_module_struct *sf) #ifdef ZTS sapi_globals_id = ts_allocate_id(sizeof(sapi_globals_struct), sapi_globals_ctor, NULL); +#else + sapi_globals_ctor(&sapi_globals); #endif + reentrancy_startup(); php_global_startup_internal_extensions(); |