com php-src: Remove remnants of TSMRLS_* macro calls: sapi/cli/php_cli_server.c sapi/litespeed/lsapi_mai n.c

Commit: fb8486f3bdd84d92da7c05e6e3c226df71c574da Author: Thomas Punt <tpunt@hotmail.co.uk> Wed, 18 Jan 2017 09:48:23 +0000 Committer: Joe Watkins <krakjoe@php.net> Wed, 18 Jan 2017 17:42:45 +0000 Parents: 280e9cb28d07a69e56ebcde4c368f3053298abe3 Branches: PHP-7.0 PHP-7.1 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=fb8486f3bdd84d92da7c05e6e3c226df71c574da Log: Remove remnants of TSMRLS_* macro calls Changed paths: M sapi/cli/php_cli_server.c M sapi/litespeed/lsapi_main.c Diff: diff --git a/sapi/cli/php_cli_server.c b/sapi/cli/php_cli_server.c index 8a651b0..5d82074 100644 --- a/sapi/cli/php_cli_server.c +++ b/sapi/cli/php_cli_server.c @@ -1961,7 +1961,7 @@ static int php_cli_server_begin_send_static(php_cli_server *server, php_cli_serv if (client->request.path_translated && ('.' == client->request.path_translated[client->request.path_translated_len-1] || ' ' == client->request.path_translated[client->request.path_translated_len-1])) { - return php_cli_server_send_error_page(server, client, 500 TSRMLS_CC); + return php_cli_server_send_error_page(server, client, 500); } #endif diff --git a/sapi/litespeed/lsapi_main.c b/sapi/litespeed/lsapi_main.c index e493868..06aa610 100644 --- a/sapi/litespeed/lsapi_main.c +++ b/sapi/litespeed/lsapi_main.c @@ -872,7 +872,7 @@ static int lsapi_activate_user_ini_finally(_lsapi_activate_user_ini_ctx *ctx, return rc; } -static int lsapi_activate_user_ini(TSRMLS_D) +static int lsapi_activate_user_ini( void ) { _lsapi_activate_user_ini_ctx ctx; /**