Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  Avoid dependency on "struct flock" fields order.

diff --cc ext/opcache/ZendAccelerator.c
Simple merge

diff --cc ext/opcache/ZendAccelerator.h
Simple merge

diff --cc ext/opcache/config.m4
index 392f4c65a336c05244a7bcae5997828377e57634,aa50d561164b9e8eb4a0956e51797bd933eb75c0..4810217c14d8f8e4f7896c4c4a0f32741d871000
--- 1/ext/opcache/config.m4
--- 2/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 \

diff --cc ext/opcache/zend_shared_alloc.c
Simple merge