]> granicus.if.org Git - php/commitdiff
- Note quite sure why this wasn't done.
authorAndi Gutmans <andi@php.net>
Thu, 16 Mar 2000 21:23:24 +0000 (21:23 +0000)
committerAndi Gutmans <andi@php.net>
Thu, 16 Mar 2000 21:23:24 +0000 (21:23 +0000)
main/SAPI.c

index 50289d5dafdb16c6e3b508d3af58f5dbce415ea3..bb20de383df5161f1c55f30365465d4a8f97ba0c 100644 (file)
@@ -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();