com php-src: Merge branch 'PHP-7.3' into PHP-7.4: 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:22:13 +0000 |
| Subject: | com php-src: Merge branch 'PHP-7.3' into PHP-7.4: 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-104565@lists.php.net to get a copy of this message | ||
Commit: 26e26969c1abd062d56aaf8650240d54fae5d9f3
Author: Dmitry Stogov <dmitry@zend.com> Tue, 12 Feb 2019 10:22:13 +0300
Parents: 8724f9b38ea3ba9a3ecea5488515f6b854fa5dc6 470f5891d48cad64fd73dbb34775b3bcce1337cf
Branches: PHP-7.4 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=26e26969c1abd062d56aaf8650240d54fae5d9f3
Log:
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
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/ZendAccelerator.h
index 47ce1bb,82d666c..e281d67
--- a/ext/opcache/ZendAccelerator.h
+++ b/ext/opcache/ZendAccelerator.h
@@@ -89,22 -89,9 +89,9 @@@
/*** file locking ***/
#ifndef ZEND_WIN32
extern int lock_file;
-
- # if defined(HAVE_FLOCK_AIX64)
- # define FLOCK_STRUCTURE(name, type, whence, start, len) \
- struct flock name = {type, whence, 0, 0, 0, start, len }
- # elif defined(HAVE_FLOCK_BSD)
- # define FLOCK_STRUCTURE(name, type, whence, start, len) \
- struct flock name = {start, len, -1, type, whence}
- # elif defined(HAVE_FLOCK_LINUX)
- # define FLOCK_STRUCTURE(name, type, whence, start, len) \
- struct flock name = {type, whence, start, len}
- # else
- # error "Don't know how to define struct flock"
- # endif
#endif
-#if defined(HAVE_OPCACHE_FILE_CACHE) && defined(ZEND_WIN32)
+#if defined(ZEND_WIN32)
# define ENABLE_FILE_CACHE_FALLBACK 1
#else
# define ENABLE_FILE_CACHE_FALLBACK 0