From: Christoph M. Becker <cmbecker69@gmx.de>
Date: Tue, 29 Oct 2019 08:57:27 +0000 (+0100)
Subject: Merge branch 'PHP-7.4'
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=657f7e898d6ed79704aa68f96393b68c99b0479e;p=php

Merge branch 'PHP-7.4'

* PHP-7.4:
  Skip test case on non Windows platforms
---

657f7e898d6ed79704aa68f96393b68c99b0479e
diff --cc ext/ffi/tests/bug78270_2.phpt
index 6b577fa287,60ba27853e..a7cce3fc1e
--- a/ext/ffi/tests/bug78270_2.phpt
+++ b/ext/ffi/tests/bug78270_2.phpt
@@@ -3,7 -3,9 +3,9 @@@ FR #78270 (Usage of __vectorcall conven
  --SKIPIF--
  <?php
  require_once('skipif.inc');
+ if (substr(PHP_OS, 0, 3) != 'WIN') die("skip this test is for Windows platforms only");
+ 
 -$dll = 'php7' . (PHP_ZTS ? 'ts' : '') . (PHP_DEBUG ? '_debug' : '') . '.dll';
 +$dll = 'php8' . (PHP_ZTS ? 'ts' : '') . (PHP_DEBUG ? '_debug' : '') . '.dll';
  try {
      FFI::cdef(<<<EOC
          __vectorcall int zend_atoi(const char *str, size_t str_len);