diff options
author | Nikita Popov <nikita.ppv@gmail.com> | 2020-08-05 15:44:04 +0200 |
---|---|---|
committer | Nikita Popov <nikita.ppv@gmail.com> | 2020-08-05 15:44:04 +0200 |
commit | 643145b59d03ee9c92390078d545c4c45baca69b (patch) | |
tree | cb5cc13b2277bd3bcd82f6edac073c41f085c4e9 /ext/opcache/zend_file_cache.c | |
parent | 002908a5c5db8be34973fefe699d7b35b880989e (diff) | |
parent | 6bf8ff6d972b0d3bb2b0265a7b04af8adf0e47bf (diff) | |
download | php-git-643145b59d03ee9c92390078d545c4c45baca69b.tar.gz |
Merge branch 'PHP-7.4'
* PHP-7.4:
Fixed bug #79930
Fix iov_base pointer type for illumos
Backport bless_tests.php changes from PHP 8
Diffstat (limited to 'ext/opcache/zend_file_cache.c')
-rw-r--r-- | ext/opcache/zend_file_cache.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/opcache/zend_file_cache.c b/ext/opcache/zend_file_cache.c index 9e9463c8fd..44ade7f6bd 100644 --- a/ext/opcache/zend_file_cache.c +++ b/ext/opcache/zend_file_cache.c @@ -1025,7 +1025,7 @@ int zend_file_cache_script_store(zend_persistent_script *script, int in_shm) #endif #ifdef HAVE_SYS_UIO_H - vec[0].iov_base = &info; + vec[0].iov_base = (void *)&info; vec[0].iov_len = sizeof(info); vec[1].iov_base = buf; vec[1].iov_len = script->size; |