summaryrefslogtreecommitdiff
path: root/sapi/apache2handler/php_functions.c
diff options
context:
space:
mode:
authorkrakjoe <joe.watkins@live.co.uk>2014-09-20 20:22:14 +0100
committerkrakjoe <joe.watkins@live.co.uk>2014-09-20 20:22:14 +0100
commitb3aebda9eaf55706af2e21178f229a171725a168 (patch)
tree9aa1794dc4b513d5c0077adcbeb89fa215f181a4 /sapi/apache2handler/php_functions.c
parent763bfb4f3b0e66d5a961f9f367aa86e9f9da262e (diff)
downloadphp-git-b3aebda9eaf55706af2e21178f229a171725a168.tar.gz
native tls initial patch
Diffstat (limited to 'sapi/apache2handler/php_functions.c')
-rw-r--r--sapi/apache2handler/php_functions.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sapi/apache2handler/php_functions.c b/sapi/apache2handler/php_functions.c
index 27643b8917..c79af0e3db 100644
--- a/sapi/apache2handler/php_functions.c
+++ b/sapi/apache2handler/php_functions.c
@@ -49,7 +49,7 @@
#include "php_apache.h"
#ifdef ZTS
-int php_apache2_info_id;
+TSRMG_D(php_apache2_info_struct, php_apache2_info_id);
#else
php_apache2_info_struct php_apache2_info;
#endif
@@ -536,7 +536,7 @@ PHP_INI_END()
static PHP_MINIT_FUNCTION(apache)
{
#ifdef ZTS
- ts_allocate_id(&php_apache2_info_id, sizeof(php_apache2_info_struct), (ts_allocate_ctor) NULL, NULL);
+ TSRMG_ALLOCATE(php_apache2_info_id, sizeof(php_apache2_info_struct), NULL, NULL);
#endif
REGISTER_INI_ENTRIES();
return SUCCESS;