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)
* PHP-5.5:
  wrap int8_t and int16_t with #ifdef to avoid possible clashes


Trivial merge