Fixed bug #70991 (zend_file_cache.c:710: error: array type has incomplete element...

diff --git a/NEWS b/NEWS
index bd59de32bde76e145b2e25ce96c8df5c10bb2bbc..42be771f179733decc6b4264555722bfabaf66aa 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -36,6 +36,8 @@ PHP                                                                        NEWS
     by gcov. (Senthil)
 
 - Opcache:
+  . Fixed bug #70991 (zend_file_cache.c:710: error: array type has incomplete
+    element type). (Laruence)
   . Fixed bug #70977 (Segmentation fault with opcache.huge_code_pages=1).
     (Laruence)
 
@@ -47,6 +49,8 @@ PHP                                                                        NEWS
     5.6). (Laruence)
 
 - Standard:
+  . Fixed bug #70999 (php_random_bytes: called object is not a function).
+    (Scott)
   . Fixed bug #70960 (ReflectionFunction for array_unique returns wrong number
     of parameters). (Laruence)
 

diff --git a/ext/opcache/config.m4 b/ext/opcache/config.m4
index fbe18f8e2c4e3752d8c703763b0fb093021b0738..497aa4c79abb357a66a436b5c44e832a1465c80e 100644 (file)
--- a/ext/opcache/config.m4
+++ b/ext/opcache/config.m4
@@ -26,6 +26,8 @@ if test "$PHP_OPCACHE" != "no"; then
     AC_DEFINE(HAVE_MPROTECT, 1, [Define if you have mprotect() function])
   ])
 
+  AC_CHECK_HEADERS([unistd.h sys/uio.h])
+
   AC_MSG_CHECKING(for sysvipc shared memory support)
   AC_TRY_RUN([
 #include <sys/types.h>

diff --git a/ext/opcache/zend_file_cache.c b/ext/opcache/zend_file_cache.c
index 7c615e927b4b33a67448f5a812c8903d45ae05c1..993358bdf51b9175cf65a4f8372b86be19f255fb 100644 (file)
--- a/ext/opcache/zend_file_cache.c
+++ b/ext/opcache/zend_file_cache.c
@@ -706,7 +706,7 @@ int zend_file_cache_script_store(zend_persistent_script *script, int in_shm)
        int fd;
        char *filename;
        zend_file_cache_metainfo info;
-#ifndef ZEND_WIN32
+#ifdef HAVE_SYS_UIO_H
        struct iovec vec[3];
 #endif
        void *mem, *buf;
@@ -761,7 +761,7 @@ int zend_file_cache_script_store(zend_persistent_script *script, int in_shm)
        info.checksum = zend_adler32(ADLER32_INIT, buf, script->size);
        info.checksum = zend_adler32(info.checksum, (signed char*)ZSTR_VAL((zend_string*)ZCG(mem)), info.str_size);
 
-#ifndef ZEND_WIN32
+#ifdef HAVE_SYS_UIO_H
        vec[0].iov_base = &info;
        vec[0].iov_len = sizeof(info);
        vec[1].iov_base = buf;