]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorAnatol Belski <ab@php.net>
Sat, 6 Dec 2014 11:18:36 +0000 (12:18 +0100)
committerAnatol Belski <ab@php.net>
Sat, 6 Dec 2014 11:18:36 +0000 (12:18 +0100)
* PHP-5.6:
  C89 compat
  add include for missing localeconv_r proto

1  2 
ext/pdo_mysql/mysql_driver.c
ext/standard/formatted_print.c
main/snprintf.c
main/spprintf.c

Simple merge
Simple merge
diff --cc main/snprintf.c
Simple merge
diff --cc main/spprintf.c
Simple merge