]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorAnatol Belski <ab@php.net>
Thu, 7 Aug 2014 13:23:03 +0000 (15:23 +0200)
committerAnatol Belski <ab@php.net>
Thu, 7 Aug 2014 13:23:03 +0000 (15:23 +0200)
* PHP-5.6:
  wrap int8_t and int16_t with #ifdef to avoid possible clashes


Trivial merge