summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sapi/fpm/config.m42
-rw-r--r--sapi/fpm/fpm/fpm_main.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/sapi/fpm/config.m4 b/sapi/fpm/config.m4
index 2fbfc798c2..b23a6746d1 100644
--- a/sapi/fpm/config.m4
+++ b/sapi/fpm/config.m4
@@ -685,7 +685,7 @@ if test "$PHP_FPM" != "no"; then
PHP_FPM_TRACE_FILES="fpm/fpm_trace.c fpm/fpm_trace_$fpm_trace_type.c"
fi
- PHP_FPM_CFLAGS="-I$abs_srcdir/sapi/fpm"
+ PHP_FPM_CFLAGS="-I$abs_srcdir/sapi/fpm -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1"
PHP_FPM_FILES="fpm/fpm.c \
fpm/fpm_children.c \
diff --git a/sapi/fpm/fpm/fpm_main.c b/sapi/fpm/fpm/fpm_main.c
index 33dc5f857f..843e5d913f 100644
--- a/sapi/fpm/fpm/fpm_main.c
+++ b/sapi/fpm/fpm/fpm_main.c
@@ -182,7 +182,7 @@ static void user_config_cache_entry_dtor(zval *el)
#ifdef ZTS
static int php_cgi_globals_id;
-#define CGIG(v) TSRMG(php_cgi_globals_id, php_cgi_globals_struct *, v)
+#define CGIG(v) ZEND_TSRMG(php_cgi_globals_id, php_cgi_globals_struct *, v)
#else
static php_cgi_globals_struct php_cgi_globals;
#define CGIG(v) (php_cgi_globals.v)