summaryrefslogtreecommitdiff
path: root/ext/mbstring/libmbfl/mbfl
diff options
context:
space:
mode:
authorNikita Popov <nikita.ppv@gmail.com>2017-07-20 18:29:44 +0200
committerNikita Popov <nikita.ppv@gmail.com>2017-07-20 18:29:44 +0200
commit22a5f554a8766d63fd2c2ce91a90ebacb13c0f6a (patch)
tree75e69a131351ef207c8d01c471f245330b47716a /ext/mbstring/libmbfl/mbfl
parent77cb7bd837b128340fe9a2511681dd0d3c7222c5 (diff)
downloadphp-git-22a5f554a8766d63fd2c2ce91a90ebacb13c0f6a.tar.gz
Temporary fix for windows build
This API should be changed to stop using negative offsets. For now I'm replacing ssize_t with long.
Diffstat (limited to 'ext/mbstring/libmbfl/mbfl')
-rw-r--r--ext/mbstring/libmbfl/mbfl/mbfilter.c2
-rw-r--r--ext/mbstring/libmbfl/mbfl/mbfilter.h2
2 files changed, 2 insertions, 2 deletions
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);
/*