From: Anatol Belski Date: Thu, 21 Aug 2014 07:09:47 +0000 (+0200) Subject: Merge branch 'PHP-5.6' X-Git-Tag: PRE_64BIT_BRANCH_MERGE~15 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=333f093010a5c3d45d16f45d40b3515e4029bad0;p=php Merge branch 'PHP-5.6' * PHP-5.6: avoid clash when stdint.h was included after win32/php_stdint.h --- 333f093010a5c3d45d16f45d40b3515e4029bad0