]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.6'
authorAnatol Belski <ab@php.net>
Thu, 7 Aug 2014 13:23:03 +0000 (15:23 +0200)
committerAnatol Belski <ab@php.net>
Thu, 7 Aug 2014 13:23:03 +0000 (15:23 +0200)
commit898b5e5d52626d99e50f4a94fc18a44f6bbb9473
tree4bda0608d917b4a203f9707734a26c1650160aad
parent3fd379e1964fff01eb2cd6d0ef3eb9fb72ce5160
parent2cdc1a2b7473eff27c224c66dcb85118b553a147
Merge branch 'PHP-5.6'

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