Remove remnants of TSMRLS_* macro calls

tpunt · krakjoe · commit fb8486f3bdd8 · 2017-01-18T17:42:45.000Z
diff --git 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
@@ -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;
     /**

Original file line number	Diff line number	Diff line change
`@@ -1961,7 +1961,7 @@ static int php_cli_server_begin_send_static(php_cli_server *server, php_cli_serv`
`1961`	`1961`	`if (client->request.path_translated &&`
`1962`	`1962`	`('.' == client->request.path_translated[client->request.path_translated_len-1] \|\|`
`1963`	`1963`	`' ' == client->request.path_translated[client->request.path_translated_len-1])) {`
`1964`		`- return php_cli_server_send_error_page(server, client, 500 TSRMLS_CC);`
	`1964`	`+ return php_cli_server_send_error_page(server, client, 500);`
`1965`	`1965`	`}`
`1966`	`1966`	`#endif`
`1967`	`1967`
Original file line number	Diff line number	Diff line change
`@@ -872,7 +872,7 @@ static int lsapi_activate_user_ini_finally(_lsapi_activate_user_ini_ctx *ctx,`
`872`	`872`	`return rc;`
`873`	`873`	`}`
`874`	`874`
`875`		`-static int lsapi_activate_user_ini(TSRMLS_D)`
	`875`	`+static int lsapi_activate_user_ini( void )`
`876`	`876`	`{`
`877`	`877`	`_lsapi_activate_user_ini_ctx ctx;`
`878`	`878`	`/**`