com php-src: Merge branch 'PHP-7.0' into PHP-7.1: Zend/zend_m ultiply.h ext/pcre/php_pcre.c
| From: | Anatol Belski | Date: | Thu, 13 Oct 2016 13:25:25 +0000 |
| Subject: | com php-src: Merge branch 'PHP-7.0' into PHP-7.1: Zend/zend_m ultiply.h ext/pcre/php_pcre.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-95025@lists.php.net to get a copy of this message | ||
Commit: de2b00b403fccbafb0815049fba65f124d5ea5e6
Author: Anatol Belski <ab@php.net> Thu, 13 Oct 2016 15:25:25 +0200
Parents: 19605950fcbe6423384ed5d72a6604018c775fbc 730288ae41fe0d40d00b27174b558cf260b1a7df
Branches: PHP-7.1 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=de2b00b403fccbafb0815049fba65f124d5ea5e6
Log:
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
rename publicly exposed symbol to avoid name conflicts
Changed paths:
MM Zend/zend_multiply.h
MM ext/pcre/php_pcre.c
Diff: