From: Nikita Popov Date: Thu, 20 Jul 2017 16:29:44 +0000 (+0200) Subject: Temporary fix for windows build X-Git-Tag: php-7.3.0alpha1~1867 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=22a5f554a8766d63fd2c2ce91a90ebacb13c0f6a;p=php Temporary fix for windows build This API should be changed to stop using negative offsets. For now I'm replacing ssize_t with long. --- diff --git a/ext/mbstring/libmbfl/mbfl/mbfilter.c b/ext/mbstring/libmbfl/mbfl/mbfilter.c index 8a2ef80054..3a68558d45 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 53001d84e6..11d9ce40b9 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); /*