From: Anatol Belski <ab@php.net>
Date: Thu, 7 Aug 2014 13:22:28 +0000 (+0200)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: PRE_PHPNG_MERGE~18^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2cdc1a2b7473eff27c224c66dcb85118b553a147;p=php

Merge branch 'PHP-5.5' into PHP-5.6

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

2cdc1a2b7473eff27c224c66dcb85118b553a147