diff options
Diffstat (limited to 'sapi/apache2handler')
| -rw-r--r-- | sapi/apache2handler/php_apache.h | 2 | ||||
| -rw-r--r-- | sapi/apache2handler/sapi_apache2.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sapi/apache2handler/php_apache.h b/sapi/apache2handler/php_apache.h index 9ef1c7fdc9..489892cb60 100644 --- a/sapi/apache2handler/php_apache.h +++ b/sapi/apache2handler/php_apache.h @@ -80,7 +80,7 @@ extern zend_module_entry apache2_module_entry; #ifdef ZTS extern int php_apache2_info_id; #define AP2(v) ZEND_TSRMG(php_apache2_info_id, php_apache2_info_struct *, v) -ZEND_TSRMLS_CACHE_EXTERN; +ZEND_TSRMLS_CACHE_EXTERN(); #else extern php_apache2_info_struct php_apache2_info; #define AP2(v) (php_apache2_info.v) diff --git a/sapi/apache2handler/sapi_apache2.c b/sapi/apache2handler/sapi_apache2.c index 4361b78d33..ed4c9f30df 100644 --- a/sapi/apache2handler/sapi_apache2.c +++ b/sapi/apache2handler/sapi_apache2.c @@ -72,7 +72,7 @@ /* A way to specify the location of the php.ini dir in an apache directive */ char *apache2_php_ini_path_override = NULL; #if defined(PHP_WIN32) && defined(ZTS) -ZEND_TSRMLS_CACHE_DEFINE; +ZEND_TSRMLS_CACHE_DEFINE(); #endif static size_t @@ -459,7 +459,7 @@ php_apache_server_startup(apr_pool_t *pconf, apr_pool_t *plog, apr_pool_t *ptemp #ifdef ZTS tsrm_startup(1, 1, 0, NULL); (void)ts_resource(0); - ZEND_TSRMLS_CACHE_UPDATE; + ZEND_TSRMLS_CACHE_UPDATE(); #endif sapi_startup(&apache2_sapi_module); apache2_sapi_module.startup(&apache2_sapi_module); @@ -552,7 +552,7 @@ static int php_handler(request_rec *r) #ifdef ZTS /* initial resource fetch */ (void)ts_resource(0); - ZEND_TSRMLS_CACHE_UPDATE; + ZEND_TSRMLS_CACHE_UPDATE(); #endif #define PHPAP_INI_OFF php_apache_ini_dtor(r, parent_req); |