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


Trivial merge