]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.1'
authorAnatol Belski <ab@php.net>
Sat, 1 Jul 2017 16:39:02 +0000 (18:39 +0200)
committerAnatol Belski <ab@php.net>
Sat, 1 Jul 2017 16:39:02 +0000 (18:39 +0200)
* PHP-7.1:
  fix C++ compat

1  2 
Zend/zend_modules.h

Simple merge