sniper Tue Feb 25 04:45:47 2003 EDT
Modified files: (Branch: PHP_4_3)
/php4/main php.h php_sprintf.c snprintf.c snprintf.h
Log:
MFH: Fixed bug #20256 (snprintf() not defined on some systems)
Index: php4/main/php.h
diff -u php4/main/php.h:1.178.2.1 php4/main/php.h:1.178.2.2
--- php4/main/php.h:1.178.2.1 Tue Dec 31 11:26:13 2002
+++ php4/main/php.h Tue Feb 25 04:45:47 2003
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php.h,v 1.178.2.1 2002/12/31 16:26:13 sebastian Exp $ */
+/* $Id: php.h,v 1.178.2.2 2003/02/25 09:45:47 sniper Exp $ */
#ifndef PHP_H
#define PHP_H
@@ -218,7 +218,7 @@
#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"
Index: php4/main/php_sprintf.c
diff -u php4/main/php_sprintf.c:1.12.8.1 php4/main/php_sprintf.c:1.12.8.2
--- php4/main/php_sprintf.c:1.12.8.1 Tue Dec 31 11:26:20 2002
+++ php4/main/php_sprintf.c Tue Feb 25 04:45:47 2003
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_sprintf.c,v 1.12.8.1 2002/12/31 16:26:20 sebastian Exp $ */
+/* $Id: php_sprintf.c,v 1.12.8.2 2003/02/25 09:45:47 sniper Exp $ */
#include <stdio.h>
#include <stdarg.h>
@@ -39,7 +39,7 @@
return strlen (s);
}
-#endif /* BROKEN_SPRINTF */
+#endif /* PHP_BROKEN_SPRINTF */
/*
* Local variables:
Index: php4/main/snprintf.c
diff -u php4/main/snprintf.c:1.17.4.2 php4/main/snprintf.c:1.17.4.3
--- php4/main/snprintf.c:1.17.4.2 Thu Feb 13 14:03:29 2003
+++ php4/main/snprintf.c Tue Feb 25 04:45:47 2003
@@ -419,7 +419,7 @@
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
Index: php4/main/snprintf.h
diff -u php4/main/snprintf.h:1.18.4.1 php4/main/snprintf.h:1.18.4.2
--- php4/main/snprintf.h:1.18.4.1 Tue Dec 31 11:26:26 2002
+++ php4/main/snprintf.h Tue Feb 25 04:45:47 2003
@@ -62,12 +62,12 @@
#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
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
