use thread-safe functions unconditionally

diff --git a/main/snprintf.c b/main/snprintf.c
index bf14e904c52129daa5ee5b5cf132c86e094a8290..e83f5630f8363d5b89c98f61d172d0fc0c682fac 100644 (file)
--- a/main/snprintf.c
+++ b/main/snprintf.c
@@ -132,6 +132,7 @@ ap_php_conv_10(register wide_int num, register bool_int is_unsigned,
        return (p);
 }
 
+#define        NDIG    80
 
 
 /*
@@ -253,14 +254,6 @@ char *
        return (p);
 }
 
-#ifdef HAVE_GCVT
-
-#define ap_php_ecvt ecvt
-#define ap_php_fcvt fcvt
-#define ap_php_gcvt gcvt
-
-#else
-
 /*
  * cvt.c - IEEE floating point formatting routines for FreeBSD
  * from GNU libc-4.6.27
@@ -273,7 +266,6 @@ char *
  *      sign is set to 0 for positive, 1 for negative
  */
 
-#define        NDIG    80
 
 char *
 ap_php_cvt(double arg, int ndigits, int *decpt, int *sign, int eflag, char *buf)
@@ -422,8 +414,6 @@ ap_php_gcvt(double number, int ndigit, char *buf, boolean_e altform)
        return (buf);
 }
 
-#endif                                                 /* HAVE_CVT */
-
 #if !defined(HAVE_SNPRINTF) || !defined(HAVE_VSNPRINTF) || defined(BROKEN_SNPRINTF) || defined(BROKEN_VSNPRINTF)
 
 /*

diff --git a/main/snprintf.h b/main/snprintf.h
index 1efa77f1220568515bbfb5462c48461b0175be1a..767ce4e0c220ba3988bd24c4d4bc017b2355d2fb 100644 (file)
--- a/main/snprintf.h
+++ b/main/snprintf.h
@@ -38,21 +38,11 @@ typedef enum {
        NO = 0, YES = 1
 } boolean_e;
 
-#ifdef HAVE_GCVT
-
-#define ap_php_ecvt ecvt
-#define ap_php_fcvt fcvt
-#define ap_php_gcvt gcvt
-
-#else
-
 extern char * ap_php_cvt(double arg, int ndigits, int *decpt, int *sign, int eflag, char *buf);
 extern char * ap_php_ecvt(double arg, int ndigits, int *decpt, int *sign, char *buf);
 extern char * ap_php_fcvt(double arg, int ndigits, int *decpt, int *sign, char *buf);
 extern char * ap_php_gcvt(double number, int ndigit, char *buf, boolean_e altform);
 
-#endif
-
 #define WIDE_INT               long
 typedef WIDE_INT wide_int;
 typedef unsigned WIDE_INT u_wide_int;