diff options
Diffstat (limited to 'main/spprintf.c')
| -rw-r--r-- | main/spprintf.c | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/main/spprintf.c b/main/spprintf.c index 1fcce9df18..ee73d4f4e5 100644 --- a/main/spprintf.c +++ b/main/spprintf.c @@ -93,7 +93,12 @@ #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) +#endif #else #define LCONV_DECIMAL_POINT '.' #endif @@ -218,8 +223,12 @@ static void xbuf_format_converter(void *xbuf, zend_bool is_char, const char *fmt 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 @@ -633,10 +642,14 @@ static void xbuf_format_converter(void *xbuf, zend_bool is_char, const char *fmt 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:'.', @@ -689,10 +702,14 @@ static void xbuf_format_converter(void *xbuf, zend_bool is_char, const char *fmt * * 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++; |