diff options
author | Remi Collet <remi@php.net> | 2016-03-16 07:18:09 +0100 |
---|---|---|
committer | Remi Collet <remi@php.net> | 2016-03-16 07:18:09 +0100 |
commit | 46293ed6d451f9a8a4653cd0179b3f501bb12b4a (patch) | |
tree | cc2f761f7a9f4ee33f92297e84f63b18c7026d31 /ext/mysqlnd/mysqlnd_block_alloc.c | |
parent | ba71144b8c252fda301140f378716c528f3986f4 (diff) | |
parent | 478c80712877da23019802178da1fcd6e6b83e1e (diff) | |
download | php-git-46293ed6d451f9a8a4653cd0179b3f501bb12b4a.tar.gz |
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
fix #ifdef usage
Diffstat (limited to 'ext/mysqlnd/mysqlnd_block_alloc.c')
0 files changed, 0 insertions, 0 deletions