From: Dmitry Stogov <dmitry@zend.com>
Date: Wed, 2 Mar 2016 10:03:22 +0000 (+0300)
Subject: Merge branch 'PHP-7.0'
X-Git-Tag: php-7.1.0alpha1~540
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=95eda16fe97aa6c3647f8624fe2345f3c571f0c2;p=php

Merge branch 'PHP-7.0'

* PHP-7.0:
  Fixed test (sizeof(zend_string) is different on 32 and 64-bit systems)
---

95eda16fe97aa6c3647f8624fe2345f3c571f0c2