summaryrefslogtreecommitdiff
path: root/main/php_ini.c
diff options
context:
space:
mode:
authorkrakjoe <joe.watkins@live.co.uk>2014-09-26 11:07:57 +0100
committerkrakjoe <joe.watkins@live.co.uk>2014-09-26 11:07:57 +0100
commitaee0fefedf85f143e69be8f76a9f1a5c1eba8fa0 (patch)
tree73a1af7fbfedf66535c4f09da3a9ceecbe14356f /main/php_ini.c
parent7d36a1a8414ea60c20cf7f49240d450b08174464 (diff)
parentf7900367116f333b5a4582b29a2c1f7d2d9b6453 (diff)
downloadphp-git-aee0fefedf85f143e69be8f76a9f1a5c1eba8fa0.tar.gz
Merge branch 'native-tls' of https://github.com/php/php-src into native-tls
Diffstat (limited to 'main/php_ini.c')
-rw-r--r--main/php_ini.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/main/php_ini.c b/main/php_ini.c
index c90dc9f29f..d90ee9dedb 100644
--- a/main/php_ini.c
+++ b/main/php_ini.c
@@ -170,7 +170,6 @@ static int php_ini_available(zval *el, void *arg TSRMLS_DC)
PHPAPI void display_ini_entries(zend_module_entry *module)
{
int module_number, module_number_available;
- TSRMLS_FETCH();
if (module) {
module_number = module->module_number;