From: Dmitry Stogov <dmitry@zend.com>
Date: Thu, 12 Mar 2020 08:45:05 +0000 (+0300)
Subject: Merge branch 'PHP-7.4'
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=10726588b119c0401ef9ca81497c59587383d478;p=php

Merge branch 'PHP-7.4'

* PHP-7.4:
  Export FFI::__BIGGEST_ALIGNMENT__
---

10726588b119c0401ef9ca81497c59587383d478
diff --cc ext/ffi/tests/022.phpt
index 9e5bb915e1,3eb28fb214..44ddaeebd2
--- a/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;}");