diff options
| author | Remi Collet <remi@php.net> | 2019-01-08 09:33:41 +0100 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2019-01-08 09:33:41 +0100 |
| commit | 0d9935739c3a035f74b54aa518f2497975402864 (patch) | |
| tree | 5c141da6e9f33d7a574bba0a6457d41ddf191574 | |
| parent | 6305119a5193d4318add01190ca4afbb49ded102 (diff) | |
| download | php-git-0d9935739c3a035f74b54aa518f2497975402864.tar.gz | |
cleanup merge
| -rw-r--r-- | ext/mbstring/oniguruma/src/regparse.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/ext/mbstring/oniguruma/src/regparse.c b/ext/mbstring/oniguruma/src/regparse.c index 0c0b07804b..1904880eff 100644 --- a/ext/mbstring/oniguruma/src/regparse.c +++ b/ext/mbstring/oniguruma/src/regparse.c @@ -3596,7 +3596,6 @@ fetch_token(OnigToken* tok, UChar** src, UChar* end, ScanEnv* env) tok->u.code = c2; } else { /* string */ - p = tok->backp + enclen(enc, tok->backp); int len; SAFE_ENC_LEN(enc, tok->backp, end, len); p = tok->backp + len; |