]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.5' into PHP-5.6
authorAnatol Belski <ab@php.net>
Thu, 7 Aug 2014 13:22:28 +0000 (15:22 +0200)
committerAnatol Belski <ab@php.net>
Thu, 7 Aug 2014 13:22:28 +0000 (15:22 +0200)
commit2cdc1a2b7473eff27c224c66dcb85118b553a147
treef887e33c50c092b8a3364b5ca57efb9fa71e9530
parent33e9bb79a30823ebf398d1e2fc366ce34a1e1693
parent58088c24eb55cfec3bebd1cb78cf1f5d89ac94ec
Merge branch 'PHP-5.5' into PHP-5.6

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