diff options
| author | Nikita Popov <nikic@php.net> | 2016-03-03 16:46:04 +0100 |
|---|---|---|
| committer | Nikita Popov <nikic@php.net> | 2016-03-03 16:50:01 +0100 |
| commit | 1ac152938cfe40e98b7b3c8cf403abb113266cfa (patch) | |
| tree | dd2f32f9075d3ca31946c5b9d10a464a07776c3a /sapi | |
| parent | c4b188871e7abb7c6cc20d05ceda4cea082efcd2 (diff) | |
| download | php-git-1ac152938cfe40e98b7b3c8cf403abb113266cfa.tar.gz | |
Move semicolon into TSRMLS_CACHE_EXTERN/DEFINE
Also re bug #71575.
Diffstat (limited to 'sapi')
| -rw-r--r-- | sapi/apache2handler/php_apache.h | 2 | ||||
| -rw-r--r-- | sapi/apache2handler/sapi_apache2.c | 2 | ||||
| -rw-r--r-- | sapi/cgi/cgi_main.c | 2 | ||||
| -rw-r--r-- | sapi/cli/php_cli.c | 2 | ||||
| -rw-r--r-- | sapi/cli/php_cli_server.h | 2 | ||||
| -rw-r--r-- | sapi/embed/php_embed.c | 2 | ||||
| -rw-r--r-- | sapi/embed/php_embed.h | 2 | ||||
| -rw-r--r-- | sapi/phpdbg/phpdbg.c | 2 |
8 files changed, 8 insertions, 8 deletions
diff --git a/sapi/apache2handler/php_apache.h b/sapi/apache2handler/php_apache.h index 451e4e3e4c..c1c52f5697 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 4c69fa6b4d..456b9719fa 100644 --- a/sapi/apache2handler/sapi_apache2.c +++ b/sapi/apache2handler/sapi_apache2.c @@ -66,7 +66,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 diff --git a/sapi/cgi/cgi_main.c b/sapi/cgi/cgi_main.c index c1cca1e3d2..8983b53dc2 100644 --- a/sapi/cgi/cgi_main.c +++ b/sapi/cgi/cgi_main.c @@ -202,7 +202,7 @@ static void user_config_cache_entry_dtor(zval *el) static int php_cgi_globals_id; #define CGIG(v) ZEND_TSRMG(php_cgi_globals_id, php_cgi_globals_struct *, v) #if defined(PHP_WIN32) -ZEND_TSRMLS_CACHE_DEFINE(); +ZEND_TSRMLS_CACHE_DEFINE() #endif #else static php_cgi_globals_struct php_cgi_globals; diff --git a/sapi/cli/php_cli.c b/sapi/cli/php_cli.c index 907f629c01..92f1f64bf4 100644 --- a/sapi/cli/php_cli.c +++ b/sapi/cli/php_cli.c @@ -103,7 +103,7 @@ PHPAPI extern char *php_ini_scanned_path; PHPAPI extern char *php_ini_scanned_files; #if defined(PHP_WIN32) && defined(ZTS) -ZEND_TSRMLS_CACHE_DEFINE(); +ZEND_TSRMLS_CACHE_DEFINE() #endif #ifndef O_BINARY diff --git a/sapi/cli/php_cli_server.h b/sapi/cli/php_cli_server.h index d1092f65e1..cdf30bce2a 100644 --- a/sapi/cli/php_cli_server.h +++ b/sapi/cli/php_cli_server.h @@ -33,7 +33,7 @@ ZEND_END_MODULE_GLOBALS(cli_server) #ifdef ZTS #define CLI_SERVER_G(v) ZEND_TSRMG(cli_server_globals_id, zend_cli_server_globals *, v) -ZEND_TSRMLS_CACHE_EXTERN(); +ZEND_TSRMLS_CACHE_EXTERN() #else #define CLI_SERVER_G(v) (cli_server_globals.v) #endif diff --git a/sapi/embed/php_embed.c b/sapi/embed/php_embed.c index 289dc121df..18c2027271 100644 --- a/sapi/embed/php_embed.c +++ b/sapi/embed/php_embed.c @@ -34,7 +34,7 @@ const char HARDCODED_INI[] = "max_input_time=-1\n\0"; #if defined(PHP_WIN32) && defined(ZTS) -ZEND_TSRMLS_CACHE_DEFINE(); +ZEND_TSRMLS_CACHE_DEFINE() #endif static char* php_embed_read_cookies(void) diff --git a/sapi/embed/php_embed.h b/sapi/embed/php_embed.h index cde1fcef8d..92a2f70be7 100644 --- a/sapi/embed/php_embed.h +++ b/sapi/embed/php_embed.h @@ -45,7 +45,7 @@ #endif #ifdef ZTS -ZEND_TSRMLS_CACHE_EXTERN(); +ZEND_TSRMLS_CACHE_EXTERN() #endif BEGIN_EXTERN_C() diff --git a/sapi/phpdbg/phpdbg.c b/sapi/phpdbg/phpdbg.c index 9321eed2d3..68a164c499 100644 --- a/sapi/phpdbg/phpdbg.c +++ b/sapi/phpdbg/phpdbg.c @@ -53,7 +53,7 @@ #endif #if defined(PHP_WIN32) && defined(ZTS) -ZEND_TSRMLS_CACHE_DEFINE(); +ZEND_TSRMLS_CACHE_DEFINE() #endif ZEND_DECLARE_MODULE_GLOBALS(phpdbg); |