]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4' into PHP-5.5
authorAnatol Belski <ab@php.net>
Thu, 7 Aug 2014 13:21:42 +0000 (15:21 +0200)
committerAnatol Belski <ab@php.net>
Thu, 7 Aug 2014 13:21:42 +0000 (15:21 +0200)
commit58088c24eb55cfec3bebd1cb78cf1f5d89ac94ec
tree57e853ee42b22bccecdcaee4d24c7ecd6a243744
parent0753c22e76f5b7e38aef52eef1169458710c7e5f
parent7189039d650de1417e4e580865b1e77b39e3da55
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  wrap int8_t and int16_t with #ifdef to avoid possible clashes