diff options
Diffstat (limited to 'main/spprintf.c')
| -rw-r--r-- | main/spprintf.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/main/spprintf.c b/main/spprintf.c index 193da18c0a..a20705016a 100644 --- a/main/spprintf.c +++ b/main/spprintf.c @@ -89,7 +89,6 @@ #include <inttypes.h> #endif -#ifdef HAVE_LOCALE_H #include <locale.h> #ifdef ZTS #include "ext/standard/php_string.h" @@ -97,9 +96,6 @@ #else #define LCONV_DECIMAL_POINT (*lconv->decimal_point) #endif -#else -#define LCONV_DECIMAL_POINT '.' -#endif #include "snprintf.h" @@ -215,13 +211,11 @@ static void xbuf_format_converter(void *xbuf, zend_bool is_char, const char *fmt char num_buf[NUM_BUF_SIZE]; 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,7 +627,6 @@ static void xbuf_format_converter(void *xbuf, zend_bool is_char, const char *fmt s = "inf"; s_len = 3; } else { -#ifdef HAVE_LOCALE_H #ifdef ZTS localeconv_r(&lconv); #else @@ -641,7 +634,6 @@ static void xbuf_format_converter(void *xbuf, zend_bool is_char, const char *fmt 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:'.', @@ -693,7 +685,6 @@ 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 @@ -701,7 +692,6 @@ static void xbuf_format_converter(void *xbuf, zend_bool is_char, const char *fmt 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++; |