diff options
| author | Joe Watkins <krakjoe@php.net> | 2017-01-18 17:46:11 +0000 |
|---|---|---|
| committer | Joe Watkins <krakjoe@php.net> | 2017-01-18 17:46:11 +0000 |
| commit | bbe21ccf3877835d8c7c6aaadcbd9e4d20054c8b (patch) | |
| tree | bd3b1a946c57e9b358d3e3f21372f9f099a44119 /sapi/litespeed | |
| parent | bce548d8e699c8e7d1a0cbbeb0ce4de4b0f0131d (diff) | |
| parent | fb8486f3bdd84d92da7c05e6e3c226df71c574da (diff) | |
| download | php-git-bbe21ccf3877835d8c7c6aaadcbd9e4d20054c8b.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Remove remnants of TSMRLS_* macro calls
Diffstat (limited to 'sapi/litespeed')
| -rw-r--r-- | sapi/litespeed/lsapi_main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sapi/litespeed/lsapi_main.c b/sapi/litespeed/lsapi_main.c index d51a285bc5..d26f453cc6 100644 --- a/sapi/litespeed/lsapi_main.c +++ b/sapi/litespeed/lsapi_main.c @@ -865,7 +865,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; /** |