From: Christoph M. Becker <cmbecker69@gmx.de>
Date: Mon, 11 Nov 2019 11:56:32 +0000 (+0100)
Subject: Merge branch 'PHP-7.4'
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2804ea612779b89d3c62d974eb35783dd31f7dee;p=php

Merge branch 'PHP-7.4'

* PHP-7.4:
  Fix test case for Windows
---

2804ea612779b89d3c62d974eb35783dd31f7dee
diff --cc ext/ffi/tests/bug78714.phpt
index c99607c11c,1acac06ffe..a73b37cae1
--- a/ext/ffi/tests/bug78714.phpt
+++ b/ext/ffi/tests/bug78714.phpt
@@@ -6,7 -6,13 +6,13 @@@ Bug #78714 (funcs returning pointer can
  ffi.enable=1
  --FILE--
  <?php
- $ffi = FFI::cdef('char * __cdecl get_zend_version(void);');
+ $def = 'char * __cdecl get_zend_version(void);';
+ if (substr(PHP_OS, 0, 3) != 'WIN') {
+     $ffi = FFI::cdef($def);
+ } else {
 -    $dll = 'php7' . (PHP_ZTS ? 'ts' : '') . (PHP_DEBUG ? '_debug' : '') . '.dll';
++    $dll = 'php8' . (PHP_ZTS ? 'ts' : '') . (PHP_DEBUG ? '_debug' : '') . '.dll';
+     $ffi = FFI::cdef($def, $dll);
+ }
  echo substr(FFI::string($ffi->get_zend_version()), 0, 4) . "\n";
  ?>
  --EXPECT--