diff options
| author | Anatol Belski <ab@php.net> | 2014-09-26 12:10:26 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-09-26 12:11:08 +0200 |
| commit | aa627174ec12484023979b9e443d8dccbd83bb76 (patch) | |
| tree | f21473e20ee541d74390e93fe8cd683c140d4241 /sapi/cli/php_cli_server.c | |
| parent | 14eefc82b5daafc8bd095c006fca6f21d2ad8478 (diff) | |
| download | php-git-aa627174ec12484023979b9e443d8dccbd83bb76.tar.gz | |
cleanup direct tsrm_ls passing
Diffstat (limited to 'sapi/cli/php_cli_server.c')
| -rw-r--r-- | sapi/cli/php_cli_server.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/sapi/cli/php_cli_server.c b/sapi/cli/php_cli_server.c index 1e42bd6c7b..04a82e812d 100644 --- a/sapi/cli/php_cli_server.c +++ b/sapi/cli/php_cli_server.c @@ -2350,9 +2350,6 @@ 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 - void ***tsrm_ls; -#endif php_cli_server *server; int(*rhandler)(php_cli_server*, php_cli_server_client* TSRMLS_DC); int(*whandler)(php_cli_server*, php_cli_server_client* TSRMLS_DC); @@ -2361,9 +2358,7 @@ typedef struct php_cli_server_do_event_for_each_fd_callback_params { static int php_cli_server_do_event_for_each_fd_callback(void *_params, php_socket_t fd, int event) /* {{{ */ { php_cli_server_do_event_for_each_fd_callback_params *params = _params; -#ifdef ZTS - void ***tsrm_ls = params->tsrm_ls; -#endif + php_cli_server *server = params->server; if (server->server_sock == fd) { php_cli_server_client *client = NULL; @@ -2415,9 +2410,6 @@ static int php_cli_server_do_event_for_each_fd_callback(void *_params, php_socke static void php_cli_server_do_event_for_each_fd(php_cli_server *server, int(*rhandler)(php_cli_server*, php_cli_server_client* TSRMLS_DC), int(*whandler)(php_cli_server*, php_cli_server_client* TSRMLS_DC) TSRMLS_DC) /* {{{ */ { php_cli_server_do_event_for_each_fd_callback_params params = { -#ifdef ZTS - (void ***) tsrm_get_ls_cache(), -#endif server, rhandler, whandler |