From: Andi Gutmans <andi@php.net>
Date: Thu, 16 Mar 2000 21:23:24 +0000 (+0000)
Subject: - Note quite sure why this wasn't done.
X-Git-Tag: PHP-4.0-RC1~104
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1bcdb436c176885a071046c78e84ace8396e7a25;p=php

- Note quite sure why this wasn't done.
---

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();