com php-src: Merge branch 'PHP-7.2' into PHP-7.3: ext/opcache/ZendAccelerator.c ext/opcache/ZendAccelerator.h ext/opcache/config.m4
ext/opcache/zend_shared_alloc.c
| From: | Dmitry Stogov | Date: | Tue, 12 Feb 2019 07:21:59 +0000 |
| Subject: | com php-src: Merge branch 'PHP-7.2' into PHP-7.3: ext/opcache/ZendAccelerator.c ext/opcache/ZendAccelerator.h ext/opcache/config.m4 ext/opcache/zend_shared_alloc.c |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-104564@lists.php.net to get a copy of this message | ||
Commit: 470f5891d48cad64fd73dbb34775b3bcce1337cf
Author: Dmitry Stogov <dmitry@zend.com> Tue, 12 Feb 2019 10:21:59 +0300
Parents: b71146bde4fc5b829501341bd359fc8af94726ac 9222702633c63254b08466b322266b647ac3e905
Branches: PHP-7.3 PHP-7.4 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=470f5891d48cad64fd73dbb34775b3bcce1337cf
Log:
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Avoid dependency on "struct flock" fields order.
Changed paths:
MM ext/opcache/ZendAccelerator.c
MM ext/opcache/ZendAccelerator.h
MM ext/opcache/config.m4
MM ext/opcache/zend_shared_alloc.c
Diff:
diff --cc ext/opcache/config.m4
index 392f4c6,aa50d56..4810217
--- a/ext/opcache/config.m4
+++ b/ext/opcache/config.m4
@@@ -336,68 -338,11 +336,11 @@@ int main()
}
return 0;
}
-],dnl
+]])],[dnl
AC_DEFINE(HAVE_SHM_MMAP_FILE, 1, [Define if you have mmap() SHM support])
- msg=yes,msg=no,msg=no)
+ msg=yes],[msg=no],[msg=no])
AC_MSG_RESULT([$msg])
- flock_type=unknown
- AC_MSG_CHECKING(for struct flock layout)
-
- if test "$flock_type" = "unknown"; then
- AC_RUN_IFELSE([AC_LANG_SOURCE([[
- #include <fcntl.h>
- struct flock lock = { 1, 2, 3, 4, 5, 6, 7 };
- int main() {
- if(lock.l_type == 1 && lock.l_whence == 2 && lock.l_start == 6 &&
lock.l_len== 7) {
- return 0;
- }
- return 1;
- }
- ]])], [
- flock_type=aix64
- AC_DEFINE([HAVE_FLOCK_AIX64], [], [Struct flock is 64-bit AIX-type])
- ], [])
- fi
-
- if test "$flock_type" = "unknown"; then
- AC_RUN_IFELSE([AC_LANG_SOURCE([[
- #include <fcntl.h>
- struct flock lock = { 1, 2, 3, 4, 5 };
- int main() {
- if(lock.l_type == 1 && lock.l_whence == 2 && lock.l_start == 3 &&
lock.l_len == 4) {
- return 0;
- }
- return 1;
- }
- ]])], [
- flock_type=linux
- AC_DEFINE([HAVE_FLOCK_LINUX], [], [Struct flock is Linux-type])
- ], [])
- fi
-
- if test "$flock_type" = "unknown"; then
- AC_RUN_IFELSE([AC_LANG_SOURCE([[
- #include <fcntl.h>
- struct flock lock = { 1, 2, 3, 4, 5 };
- int main() {
- if(lock.l_start == 1 && lock.l_len == 2 && lock.l_type == 4 &&
lock.l_whence == 5) {
- return 0;
- }
- return 1;
- }
- ]])], [
- flock_type=bsd
- AC_DEFINE([HAVE_FLOCK_BSD], [], [Struct flock is BSD-type])
- ], [])
- fi
-
- AC_MSG_RESULT([$flock_type])
-
- if test "$flock_type" = "unknown"; then
- AC_MSG_ERROR([Don't know how to define struct flock on this system[,] set
--enable-opcache=no])
- fi
-
PHP_NEW_EXTENSION(opcache,
ZendAccelerator.c \
zend_accelerator_blacklist.c \