diff options
author | Remi Collet <remi@php.net> | 2016-10-14 10:54:09 +0200 |
---|---|---|
committer | Remi Collet <remi@php.net> | 2016-10-14 10:54:09 +0200 |
commit | 428ef5083819328b40357e1de229d5cf740a36e7 (patch) | |
tree | e00e8fcd78865194473480258b72c810b682bb4e /main/php.h | |
parent | d0b9d72da7348b518b9b2e1887f247123197792c (diff) | |
parent | e1f5b6d8dfe1543205d5b45d3dcf1d34f5e2e420 (diff) | |
download | php-git-428ef5083819328b40357e1de229d5cf740a36e7.tar.gz |
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
use zend_error instead of zend_error_noreturn
Diffstat (limited to 'main/php.h')
0 files changed, 0 insertions, 0 deletions