wrap int8_t and int16_t with #ifdef to avoid possible clashes
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  wrap int8_t and int16_t with #ifdef to avoid possible clashes
Merge branch 'PHP-5.5' into PHP-5.6

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