From: Anatol Belski Date: Thu, 7 Aug 2014 13:23:03 +0000 (+0200) Subject: Merge branch 'PHP-5.6' X-Git-Tag: PRE_PHPNG_MERGE~18 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=898b5e5d52626d99e50f4a94fc18a44f6bbb9473;p=php Merge branch 'PHP-5.6' * PHP-5.6: wrap int8_t and int16_t with #ifdef to avoid possible clashes --- 898b5e5d52626d99e50f4a94fc18a44f6bbb9473