summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--main/SAPI.c6
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();