Merge branch 'PHP-7.4'

* PHP-7.4:
  Improve FFI test suite for Windows

diff --cc ext/ffi/tests/100.phpt
index 27b6d0be0876215550fb4b2b85a6c12985f62de4,572052f372a4558ce1e715497490e4eae0de91fe..634d8d44362a79c4295cb1b748ec6f6f8ea58953
--- 1/ext/ffi/tests/100.phpt
--- 2/ext/ffi/tests/100.phpt
+++ b/ext/ffi/tests/100.phpt
@@@ -13,23 -14,18 +14,18 @@@ try 
  ffi.enable=1
  --FILE--
  <?php
- // Check if target supports "fastcall" calling convention
- try {
-     FFI::cdef("extern size_t __attribute__((fastcall)) (*zend_printf)(const char *format);");
-     $fastcall = "__attribute__((fastcall)) ";
- } catch (Throwable $e) {
-     $fastcall = "";
- }
- $zend = FFI::cdef("
+ require_once('utils.inc');
+ $fastcall = ffi_get_fastcall_specifier();
+ $zend = ffi_cdef("
 -      const char *get_zend_version(void);
 -      //char *get_zend_version(void);
 -      extern size_t (*zend_printf)(const char *format, ...);
 +    const char *get_zend_version(void);
 +    //char *get_zend_version(void);
 +    extern size_t (*zend_printf)(const char *format, ...);
  
 -      unsigned long $fastcall zend_hash_func(const char *str, size_t len);
 +    unsigned long $fastcall zend_hash_func(const char *str, size_t len);
  
 -      void $fastcall zend_str_tolower(char *str, size_t length);
 +    void $fastcall zend_str_tolower(char *str, size_t length);
  
- ");
+ ", ffi_get_php_dll_name());
  var_dump(trim(explode("\n",$zend->get_zend_version())[0]));
  //var_dump(trim(FFI::string($zend->get_zend_version())));
  var_dump($zend->zend_printf);

diff --cc ext/ffi/tests/200.phpt
index 69d0aafd04176ca0d279ec960f99c49b41391fdb,205c0ebab229a17c63870eb28f238a31feda35c0..e80d1ed08c6b89fe02bca87162aa56e81840587b
--- 1/ext/ffi/tests/200.phpt
--- 2/ext/ffi/tests/200.phpt
+++ b/ext/ffi/tests/200.phpt
@@@ -11,13 -12,13 +12,14 @@@ try 
  ?>
  --INI--
  ffi.enable=1
 +opcache.jit=0
  --FILE--
  <?php
+ require_once('utils.inc');
  $zend = FFI::cdef("
 -      typedef int (*zend_write_func_t)(const char *str, size_t str_length);
 -      extern zend_write_func_t zend_write;
 +    typedef int (*zend_write_func_t)(const char *str, size_t str_length);
 +    extern zend_write_func_t zend_write;
- ");
+ ", ffi_get_php_dll_name());
  
  echo "Hello World!\n";
  

diff --cc ext/ffi/tests/bug79096.phpt
index d8d89f05bcbc89461ea29f6130ba676518a3c957,a45b45646af8a79889b707f152abe55fa0863be9..d7470eb3024a10c68750f62871a887338fb87e5a
--- 1/ext/ffi/tests/bug79096.phpt
--- 2/ext/ffi/tests/bug79096.phpt
+++ b/ext/ffi/tests/bug79096.phpt
@@@ -7,10 -7,11 +7,11 @@@ if (!extension_loaded('zend-test')) die
  ?>
  --FILE--
  <?php
+ require_once('utils.inc');
  $header = <<<HEADER
  struct bug79096 {
 -      uint64_t a;
 -      uint64_t b;
 +    uint64_t a;
 +    uint64_t b;
  };
  
  struct bug79096 bug79096(void);