com php-src: Temporary fix for windows build: ext/mbstring/libmbfl/mbfl/mbfilter.c ext/mbstring/libmbfl/mbfl/mbfilter.h

Commit: 22a5f554a8766d63fd2c2ce91a90ebacb13c0f6a Author: Nikita Popov <nikita.ppv@gmail.com> Thu, 20 Jul 2017 18:29:44 +0200 Parents: 77cb7bd837b128340fe9a2511681dd0d3c7222c5 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=22a5f554a8766d63fd2c2ce91a90ebacb13c0f6a Log: Temporary fix for windows build This API should be changed to stop using negative offsets. For now I'm replacing ssize_t with long. Changed paths: M ext/mbstring/libmbfl/mbfl/mbfilter.c M ext/mbstring/libmbfl/mbfl/mbfilter.h Diff: diff --git a/ext/mbstring/libmbfl/mbfl/mbfilter.c b/ext/mbstring/libmbfl/mbfl/mbfilter.c index 8a2ef80..3a68558 100644 --- a/ext/mbstring/libmbfl/mbfl/mbfilter.c +++ b/ext/mbstring/libmbfl/mbfl/mbfilter.c @@ -979,7 +979,7 @@ size_t mbfl_strpos( mbfl_string *haystack, mbfl_string *needle, - ssize_t offset, + long offset, int reverse) { size_t result; diff --git a/ext/mbstring/libmbfl/mbfl/mbfilter.h b/ext/mbstring/libmbfl/mbfl/mbfilter.h index 53001d8..11d9ce4 100644 --- a/ext/mbstring/libmbfl/mbfl/mbfilter.h +++ b/ext/mbstring/libmbfl/mbfl/mbfilter.h @@ -197,7 +197,7 @@ mbfl_oddlen(mbfl_string *string); * strpos */ MBFLAPI extern size_t -mbfl_strpos(mbfl_string *haystack, mbfl_string *needle, ssize_t offset, int reverse); +mbfl_strpos(mbfl_string *haystack, mbfl_string *needle, long offset, int reverse); /*