archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-7.0'

Browse source
This commit is contained in:
Xinchen Hui 2015-12-01 10:35:48 +08:00
commit badce8c49a
2 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
ext/opcache/config.m4
View file

@ -26,6 +26,8 @@ if test "$PHP_OPCACHE" != "no"; then
AC_DEFINE(HAVE_MPROTECT, 1, [Define if you have mprotect() function]) 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_MSG_CHECKING(for sysvipc shared memory support)
AC_TRY_RUN([ AC_TRY_RUN([
#include <sys/types.h> #include <sys/types.h>

4
ext/opcache/zend_file_cache.c
View file

@ -706,7 +706,7 @@ int zend_file_cache_script_store(zend_persistent_script *script, int in_shm)
int fd; int fd;
char *filename; char *filename;
zend_file_cache_metainfo info; zend_file_cache_metainfo info;
#ifndef ZEND_WIN32 #ifdef HAVE_SYS_UIO_H
struct iovec vec[3]; struct iovec vec[3];
#endif #endif
void *mem, *buf; 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(ADLER32_INIT, buf, script->size);
info.checksum = zend_adler32(info.checksum, (signed char*)ZSTR_VAL((zend_string*)ZCG(mem)), info.str_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_base = &info;
vec[0].iov_len = sizeof(info); vec[0].iov_len = sizeof(info);
vec[1].iov_base = buf; vec[1].iov_base = buf;