diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2019-02-12 10:21:59 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2019-02-12 10:21:59 +0300 |
| commit | 470f5891d48cad64fd73dbb34775b3bcce1337cf (patch) | |
| tree | 449b03934361940f023bfd4d5b6c01acb3c90d56 /ext/opcache/ZendAccelerator.h | |
| parent | b71146bde4fc5b829501341bd359fc8af94726ac (diff) | |
| parent | 9222702633c63254b08466b322266b647ac3e905 (diff) | |
| download | php-git-470f5891d48cad64fd73dbb34775b3bcce1337cf.tar.gz | |
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Avoid dependency on "struct flock" fields order.
Diffstat (limited to 'ext/opcache/ZendAccelerator.h')
| -rw-r--r-- | ext/opcache/ZendAccelerator.h | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/ext/opcache/ZendAccelerator.h b/ext/opcache/ZendAccelerator.h index b87f93a435..82d666ccdd 100644 --- a/ext/opcache/ZendAccelerator.h +++ b/ext/opcache/ZendAccelerator.h @@ -89,19 +89,6 @@ /*** 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) |