summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Punt <tpunt@hotmail.co.uk>2017-01-18 09:48:23 +0000
committerJoe Watkins <krakjoe@php.net>2017-01-18 17:42:45 +0000
commitfb8486f3bdd84d92da7c05e6e3c226df71c574da (patch)
treed6647dca94fd51d36fcef2ba06a7dd114926abc8
parent280e9cb28d07a69e56ebcde4c368f3053298abe3 (diff)
downloadphp-git-fb8486f3bdd84d92da7c05e6e3c226df71c574da.tar.gz
Remove remnants of TSMRLS_* macro calls
-rw-r--r--sapi/cli/php_cli_server.c2
-rw-r--r--sapi/litespeed/lsapi_main.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/sapi/cli/php_cli_server.c b/sapi/cli/php_cli_server.c
index 8a651b0253..5d820743b6 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 e4938681e2..06aa6109b3 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;
/**