diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2020-08-05 15:18:03 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2020-08-05 15:18:03 +0200 |
| commit | 9d9fa32fe5b6c9da757edcb4395d534265520d5f (patch) | |
| tree | ba59e780bee71dd6ff6bdb9d6cea8f14785b49c8 | |
| parent | a2604e628f3de605f1d2c735816afdd0045d18cc (diff) | |
| parent | 12db8b90a74627bca7923343f6758d0b2ce61eac (diff) | |
| download | php-git-9d9fa32fe5b6c9da757edcb4395d534265520d5f.tar.gz | |
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix iov_base pointer type for illumos
| -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 b46edcb065..8edd70a256 100644 --- a/ext/opcache/zend_file_cache.c +++ b/ext/opcache/zend_file_cache.c @@ -943,7 +943,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; |