Fixed bug #20256 (snprintf() not defined)

diff --git a/main/php.h b/main/php.h
index 6cd191453a4d994d7f1f5b1e8ea857fd5bed9392..f02dade94a6aaf062968ed013636eaa21d2e084b 100644 (file)
--- a/main/php.h
+++ b/main/php.h
@@ -218,7 +218,7 @@ char *strerror(int);
 #define LONG_MIN (- LONG_MAX - 1)
 #endif
 
-#if !defined(HAVE_SNPRINTF) || !defined(HAVE_VSNPRINTF) || defined(BROKEN_SPRINTF) || defined(BROKEN_SNPRINTF) || defined(BROKEN_VSNPRINTF)
+#if !defined(HAVE_SNPRINTF) || !defined(HAVE_VSNPRINTF) || PHP_BROKEN_SPRINTF || PHP_BROKEN_SNPRINTF || PHP_BROKEN_VSNPRINTF
 #include "snprintf.h"
 #endif
 #include "spprintf.h"

diff --git a/main/php_sprintf.c b/main/php_sprintf.c
index cb226b28db82a30659434e9baee70a6680443e65..e3fdb005319ca2c11633fc7e06cae236f333b7c0 100644 (file)
--- a/main/php_sprintf.c
+++ b/main/php_sprintf.c
@@ -43,7 +43,7 @@ php_sprintf (char*s, const char* format, ...)
   return strlen (s);
 }
 
-#endif /* BROKEN_SPRINTF */
+#endif /* PHP_BROKEN_SPRINTF */
 
 /*
  * Local variables:

diff --git a/main/snprintf.c b/main/snprintf.c
index 0f72490f0bf78acdb0b27342a70d94c0c3ea21ac..fc3d5de1538c269c19a39cbe256dd9a748037516 100644 (file)
--- a/main/snprintf.c
+++ b/main/snprintf.c
@@ -439,7 +439,7 @@ ap_php_gcvt(double number, int ndigit, char *buf, boolean_e altform)
        return (buf);
 }
 
-#if !defined(HAVE_SNPRINTF) || !defined(HAVE_VSNPRINTF) || defined(BROKEN_SNPRINTF) || defined(BROKEN_VSNPRINTF)
+#if !defined(HAVE_SNPRINTF) || !defined(HAVE_VSNPRINTF) || PHP_BROKEN_SNPRINTF || PHP_BROKEN_VSNPRINTF
 
 /*
  * NUM_BUF_SIZE is the size of the buffer used for arithmetic conversions

diff --git a/main/snprintf.h b/main/snprintf.h
index 0a72f50e268363506b9a273fc35342a79bf03b85..0b811eb73987ead2acbd6af4e1daebcc18596c51 100644 (file)
--- a/main/snprintf.h
+++ b/main/snprintf.h
@@ -64,12 +64,12 @@ Example:
 #ifndef SNPRINTF_H
 #define SNPRINTF_H
 
-#if !defined(HAVE_SNPRINTF) || defined(BROKEN_SNPRINTF)
+#if !defined(HAVE_SNPRINTF) || PHP_BROKEN_SNPRINTF
 extern int ap_php_snprintf(char *, size_t, const char *, ...);
 #define snprintf ap_php_snprintf
 #endif
 
-#if !defined(HAVE_VSNPRINTF) || defined(BROKEN_VSNPRINTF)
+#if !defined(HAVE_VSNPRINTF) || PHP_BROKEN_VSNPRINTF
 extern int ap_php_vsnprintf(char *, size_t, const char *, va_list ap);
 #define vsnprintf ap_php_vsnprintf
 #endif