]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.1'
authorDmitry Stogov <dmitry@zend.com>
Wed, 1 Feb 2017 13:06:17 +0000 (16:06 +0300)
committerDmitry Stogov <dmitry@zend.com>
Wed, 1 Feb 2017 13:06:17 +0000 (16:06 +0300)
* PHP-7.1:
  fixed macro

1  2 
Zend/zend_types.h

Simple merge