From: Nikita Popov <nikita.ppv@gmail.com>
Date: Fri, 30 Aug 2019 15:24:06 +0000 (+0200)
Subject: Reenable alloca support on ZTS
X-Git-Tag: php-7.4.0RC1~11
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=77a0fa101ed59f05ea07b03adb1cb66962fc45e7;p=php

Reenable alloca support on ZTS

This got disabled due to an incorrect change in a preprocessor condition
in 2104bea5d756dfa40b605a4a2765a3bc4637a76c. It was not supposed to
be disabled.
---

diff --git a/Zend/zend_portability.h b/Zend/zend_portability.h
index 89173642d2..978f25bbfb 100644
--- a/Zend/zend_portability.h
+++ b/Zend/zend_portability.h
@@ -355,7 +355,7 @@ char *alloca();
 
 #endif
 
-#if (HAVE_ALLOCA || (defined (__GNUC__) && __GNUC__ >= 2)) && !(defined(ZTS)) && !(defined(ZTS) && defined(HPUX)) && !defined(DARWIN)
+#if (HAVE_ALLOCA || (defined (__GNUC__) && __GNUC__ >= 2)) && !(defined(ZTS) && defined(HPUX)) && !defined(DARWIN)
 # define ZEND_ALLOCA_MAX_SIZE (32 * 1024)
 # define ALLOCA_FLAG(name) \
 	zend_bool name;