From 4cc4f9c00a4c43811074286494a621d4c9252613 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Tue, 4 Aug 2020 15:54:31 +0200 Subject: Use standard types in fopencookie test Instead of internal __size_t / __off64_t types use ssize_t and off64_t. This makes it work on musl as well. --- build/php.m4 | 8 ++++---- main/streams/cast.c | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build/php.m4 b/build/php.m4 index e5b85b24c4..0205d01c3b 100644 --- a/build/php.m4 +++ b/build/php.m4 @@ -1464,16 +1464,16 @@ AC_RUN_IFELSE([AC_LANG_SOURCE([[ #include struct cookiedata { - __off64_t pos; + off64_t pos; }; -__ssize_t reader(void *cookie, char *buffer, size_t size) +ssize_t reader(void *cookie, char *buffer, size_t size) { return size; } -__ssize_t writer(void *cookie, const char *buffer, size_t size) +ssize_t writer(void *cookie, const char *buffer, size_t size) { return size; } int closer(void *cookie) { return 0; } -int seeker(void *cookie, __off64_t *position, int whence) +int seeker(void *cookie, off64_t *position, int whence) { ((struct cookiedata*)cookie)->pos = *position; return 0; } cookie_io_functions_t funcs = {reader, writer, seeker, closer}; diff --git a/main/streams/cast.c b/main/streams/cast.c index 262ec5e38f..73421a7588 100644 --- a/main/streams/cast.c +++ b/main/streams/cast.c @@ -103,7 +103,7 @@ static ssize_t stream_cookie_writer(void *cookie, const char *buffer, size_t siz } # ifdef COOKIE_SEEKER_USES_OFF64_T -static int stream_cookie_seeker(void *cookie, __off64_t *position, int whence) +static int stream_cookie_seeker(void *cookie, off64_t *position, int whence) { *position = php_stream_seek((php_stream *)cookie, (zend_off_t)*position, whence); -- cgit v1.2.1