]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.2'
authorAnatol Belski <ab@php.net>
Thu, 30 Nov 2017 12:23:18 +0000 (13:23 +0100)
committerAnatol Belski <ab@php.net>
Thu, 30 Nov 2017 12:23:18 +0000 (13:23 +0100)
* PHP-7.2:
  Revert "Fix macro redefinition warnings"

1  2 
Zend/zend_config.w32.h

Simple merge