diff options
| author | Anatol Belski <ab@php.net> | 2014-12-06 12:18:05 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-12-06 12:18:05 +0100 |
| commit | 08241ee3f3624d9fa9be21739a5e5cde28c24d0a (patch) | |
| tree | d53d42b8a3a07c1758063ffbdba2a71c108ee533 /main/snprintf.c | |
| parent | 8d791399807f075295f2032f60ddee802323fad9 (diff) | |
| parent | 9016018ccc7e31e543594af7f7b878590c66a82e (diff) | |
| download | php-git-08241ee3f3624d9fa9be21739a5e5cde28c24d0a.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
C89 compat
add include for missing localeconv_r proto
Diffstat (limited to 'main/snprintf.c')
| -rw-r--r-- | main/snprintf.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/main/snprintf.c b/main/snprintf.c index f42e15a21a..8eaf39324b 100644 --- a/main/snprintf.c +++ b/main/snprintf.c @@ -39,6 +39,7 @@ #ifdef HAVE_LOCALE_H #include <locale.h> #ifdef ZTS +#include "ext/standard/php_string.h" #define LCONV_DECIMAL_POINT (*lconv.decimal_point) #else #define LCONV_DECIMAL_POINT (*lconv->decimal_point) |