Skip to content

Commit c24f621

Browse files
committed
Merge branch 'PHP-8.2' into PHP-8.3
2 parents bbb6ffa + db1f7b1 commit c24f621

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

ext/zend_test/test.c

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1365,9 +1365,12 @@ PHP_ZEND_TEST_API int gh11934b_ffi_var_test_cdata;
13651365
/**
13661366
* This function allows us to simulate early return of copy_file_range by setting the limit_copy_file_range ini setting.
13671367
*/
1368-
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)
1368+
#ifdef __MUSL__
1369+
typedef off_t off64_t;
1370+
#endif
1371+
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)
13691372
{
1370-
ssize_t (*original_copy_file_range)(int, off_t *, int, off_t *, size_t, unsigned int) = dlsym(RTLD_NEXT, "copy_file_range");
1373+
ssize_t (*original_copy_file_range)(int, off64_t *, int, off64_t *, size_t, unsigned int) = dlsym(RTLD_NEXT, "copy_file_range");
13711374
if (ZT_G(limit_copy_file_range) >= Z_L(0)) {
13721375
len = ZT_G(limit_copy_file_range);
13731376
}

0 commit comments

Comments
 (0)