diff options
| author | Anatol Belski <ab@php.net> | 2015-02-16 17:19:32 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2015-02-16 17:19:32 +0100 |
| commit | af3ca74501c5d0be273e47c618d37b8ddcbb5c7f (patch) | |
| tree | 6ad9fe0b05af39d94aecfa61a45e71b828f86fb9 /sapi/cli | |
| parent | 812c0c0337960449c517a74f4feaefb1109a6ff7 (diff) | |
| download | php-git-af3ca74501c5d0be273e47c618d37b8ddcbb5c7f.tar.gz | |
made ZEND_TSRMLS_CACHE_* macros look like function calls
which also comply with the current semantics for such macros
Diffstat (limited to 'sapi/cli')
| -rw-r--r-- | sapi/cli/php_cli.c | 4 | ||||
| -rw-r--r-- | sapi/cli/php_cli_server.c | 2 | ||||
| -rw-r--r-- | sapi/cli/php_cli_server.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/sapi/cli/php_cli.c b/sapi/cli/php_cli.c index e92d95d694..4f3351726a 100644 --- a/sapi/cli/php_cli.c +++ b/sapi/cli/php_cli.c @@ -100,7 +100,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 @@ -1234,7 +1234,7 @@ int main(int argc, char *argv[]) #ifdef ZTS tsrm_startup(1, 1, 0, NULL); (void)ts_resource(0); - ZEND_TSRMLS_CACHE_UPDATE; + ZEND_TSRMLS_CACHE_UPDATE(); #endif #ifdef PHP_WIN32 diff --git a/sapi/cli/php_cli_server.c b/sapi/cli/php_cli_server.c index 6315cd8ae5..5e368355cf 100644 --- a/sapi/cli/php_cli_server.c +++ b/sapi/cli/php_cli_server.c @@ -1302,7 +1302,7 @@ out: static int php_cli_server_request_ctor(php_cli_server_request *req) /* {{{ */ { #ifdef ZTS -ZEND_TSRMLS_CACHE_UPDATE; +ZEND_TSRMLS_CACHE_UPDATE(); #endif req->protocol_version = 0; req->request_uri = NULL; diff --git a/sapi/cli/php_cli_server.h b/sapi/cli/php_cli_server.h index 6d9f46c7ed..9bbe98e1d5 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 |