Merge branch 'PHP-7.4'

* PHP-7.4:
  Export FFI::__BIGGEST_ALIGNMENT__

diff --cc ext/ffi/ffi.c
Simple merge

diff --cc ext/ffi/tests/022.phpt
index 9e5bb915e1a417197a424474fad4cef859da182c,3eb28fb21483675ebd1cb814457589f114042828..44ddaeebd29e3cf8ca1f2b8d070c67092b227ca8
--- 1/ext/ffi/tests/022.phpt
--- 2/ext/ffi/tests/022.phpt
+++ b/ext/ffi/tests/022.phpt
@@@ -61,8 -61,8 +61,8 @@@ test_size(32, "struct {char a; uint32_
  test_align(16, "struct {char a; uint32_t b __attribute__((aligned(16)));}");
  
  if (substr(PHP_OS, 0, 3) != 'WIN') {
-     test_size(32, "struct  {char a; uint32_t b __attribute__((aligned));}");
-     test_align(16, "struct  {char a; uint32_t b __attribute__((aligned));}");
 -      test_size(FFI::__BIGGEST_ALIGNMENT__ * 2, "struct  {char a; uint32_t b __attribute__((aligned));}");
 -      test_align(FFI::__BIGGEST_ALIGNMENT__, "struct  {char a; uint32_t b __attribute__((aligned));}");
++    test_size(FFI::__BIGGEST_ALIGNMENT__ * 2, "struct  {char a; uint32_t b __attribute__((aligned));}");
++    test_align(FFI::__BIGGEST_ALIGNMENT__, "struct  {char a; uint32_t b __attribute__((aligned));}");
  }
  
  test_size(16, "struct  __declspec(align(16)) {char a; uint32_t b;}");