diff options
| author | Anatol Belski <ab@php.net> | 2014-12-06 12:01:09 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-12-06 12:01:09 +0100 |
| commit | 3d68d843cb21d7147164dd4599e99afb456790c8 (patch) | |
| tree | ee44e390cd86ba7f7c5eb569b94e04c27859d651 /main/snprintf.c | |
| parent | 0d76e16504137bc096667cc5e25a9238b7a3d8a6 (diff) | |
| parent | 8d791399807f075295f2032f60ddee802323fad9 (diff) | |
| download | php-git-3d68d843cb21d7147164dd4599e99afb456790c8.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
updated NEWS
Fixed bug #65230 setting locale randomly broken
Diffstat (limited to 'main/snprintf.c')
| -rw-r--r-- | main/snprintf.c | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/main/snprintf.c b/main/snprintf.c index 0b9182b614..a1c03e5947 100644 --- a/main/snprintf.c +++ b/main/snprintf.c @@ -38,7 +38,11 @@ #ifdef HAVE_LOCALE_H #include <locale.h> +#ifdef ZTS +#define LCONV_DECIMAL_POINT (*lconv.decimal_point) +#else #define LCONV_DECIMAL_POINT (*lconv->decimal_point) +#endif #else #define LCONV_DECIMAL_POINT '.' #endif @@ -607,8 +611,12 @@ static int format_converter(register buffy * odp, const char *fmt, va_list ap) / char char_buf[2]; /* for printing %% and %<unknown> */ #ifdef HAVE_LOCALE_H +#ifdef ZTS + struct lconv lconv; +#else struct lconv *lconv = NULL; #endif +#endif /* * Flag variables @@ -1017,10 +1025,14 @@ static int format_converter(register buffy * odp, const char *fmt, va_list ap) / s_len = 3; } else { #ifdef HAVE_LOCALE_H +#ifdef ZTS + localeconv_r(&lconv); +#else if (!lconv) { lconv = localeconv(); } #endif +#endif s = php_conv_fp((*fmt == 'f')?'F':*fmt, fp_num, alternate_form, (adjust_precision == NO) ? FLOAT_DIGITS : precision, (*fmt == 'f')?LCONV_DECIMAL_POINT:'.', @@ -1074,10 +1086,14 @@ static int format_converter(register buffy * odp, const char *fmt, va_list ap) / * * We use &num_buf[ 1 ], so that we have room for the sign */ #ifdef HAVE_LOCALE_H +#ifdef ZTS + localeconv_r(&lconv); +#else if (!lconv) { lconv = localeconv(); } #endif +#endif s = php_gcvt(fp_num, precision, (*fmt=='H' || *fmt == 'k') ? '.' : LCONV_DECIMAL_POINT, (*fmt == 'G' || *fmt == 'H')?'E':'e', &num_buf[1]); if (*s == '-') { prefix_char = *s++; |