diff options
| -rw-r--r-- | ext/opcache/zend_accelerator_module.c | 2 | ||||
| -rw-r--r-- | sapi/cli/php_cli_server.c | 6 | ||||
| -rw-r--r-- | sapi/cli/php_cli_server.h | 1 |
3 files changed, 6 insertions, 3 deletions
diff --git a/ext/opcache/zend_accelerator_module.c b/ext/opcache/zend_accelerator_module.c index 6f9bbe5f86..001c3ee9ed 100644 --- a/ext/opcache/zend_accelerator_module.c +++ b/ext/opcache/zend_accelerator_module.c @@ -449,7 +449,7 @@ static zend_module_entry accel_module_entry = { NULL, zend_accel_info, ACCELERATOR_VERSION "FE", - STANDARD_MODULE_PROPERTIES_EX + STANDARD_MODULE_PROPERTIES }; int start_accel_module(TSRMLS_D) diff --git a/sapi/cli/php_cli_server.c b/sapi/cli/php_cli_server.c index 869c868edb..6e6c78fe5b 100644 --- a/sapi/cli/php_cli_server.c +++ b/sapi/cli/php_cli_server.c @@ -112,6 +112,8 @@ #define OUTPUT_IS_TTY 1 #define OUTPUT_NOT_TTY 0 +TSRMG_D(zend_cli_server_globals, cli_server_globals_id); + typedef struct php_cli_server_poller { fd_set rfds, wfds; struct { @@ -515,7 +517,7 @@ zend_module_entry cli_server_module_entry = { NULL, PHP_MINFO(cli_server), PHP_VERSION, - STANDARD_MODULE_PROPERTIES_EX + STANDARD_MODULE_PROPERTIES }; /* }}} */ @@ -2353,7 +2355,7 @@ static int php_cli_server_send_event(php_cli_server *server, php_cli_server_clie /* }}} */ typedef struct php_cli_server_do_event_for_each_fd_callback_params { -#ifdef ZTS +#ifdef PASS_TSRMLS void ***tsrm_ls; #endif php_cli_server *server; diff --git a/sapi/cli/php_cli_server.h b/sapi/cli/php_cli_server.h index 476ee2919c..55810fcfbc 100644 --- a/sapi/cli/php_cli_server.h +++ b/sapi/cli/php_cli_server.h @@ -33,6 +33,7 @@ ZEND_END_MODULE_GLOBALS(cli_server) #ifdef ZTS #define CLI_SERVER_G(v) TSRMG(cli_server_globals_id, zend_cli_server_globals *, v) +TSRMG_DH(zend_cli_server_globals, cli_server_globals_id); #else #define CLI_SERVER_G(v) (cli_server_globals.v) #endif |