[php-src] PHP-8.2: zend_test fix copy_file_range test for linux 32 bits
| From: | David Carlier | Date: | Thu, 14 Mar 2024 19:13:56 +0000 |
| Subject: | [php-src] PHP-8.2: zend_test fix copy_file_range test for linux 32 bits | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-127732@lists.php.net to get a copy of this message | ||
Author: David Carlier (devnexen)
Date: 2024-03-14T18:59:26Z
Commit: https://github.com/php/php-src/commit/db1f7b12868920c7d881cc3d377f25cedea232cb
Raw diff: https://github.com/php/php-src/commit/db1f7b12868920c7d881cc3d377f25cedea232cb.diff
zend_test fix copy_file_range test for linux 32 bits
close GH-13708
Changed paths:
M ext/zend_test/test.c
Diff:
diff --git a/ext/zend_test/test.c b/ext/zend_test/test.c
index 8c32238ce36f..d27b4543fcc0 100644
--- a/ext/zend_test/test.c
+++ b/ext/zend_test/test.c
@@ -1128,9 +1128,12 @@ PHP_ZEND_TEST_API void bug_gh9090_void_int_char_var(int i, char *fmt, ...) {
/**
* This function allows us to simulate early return of copy_file_range by setting the
limit_copy_file_range ini setting.
*/
-PHP_ZEND_TEST_API ssize_t copy_file_range(int fd_in, off_t *off_in, int fd_out, off_t *off_out,
size_t len, unsigned int flags)
+#ifdef __MUSL__
+typedef off_t off64_t;
+#endif
+PHP_ZEND_TEST_API ssize_t copy_file_range(int fd_in, off64_t *off_in, int fd_out, off64_t *off_out,
size_t len, unsigned int flags)
{
- ssize_t (*original_copy_file_range)(int, off_t *, int, off_t *, size_t, unsigned int) =
dlsym(RTLD_NEXT, "copy_file_range");
+ ssize_t (*original_copy_file_range)(int, off64_t *, int, off64_t *, size_t, unsigned int) =
dlsym(RTLD_NEXT, "copy_file_range");
if (ZT_G(limit_copy_file_range) >= Z_L(0)) {
len = ZT_G(limit_copy_file_range);
}