sniper Tue Feb 25 04:44:12 2003 EDT
Modified files:
/php4/main php.h php_sprintf.c snprintf.c snprintf.h
Log:
Fixed bug #20256 (snprintf() not defined)
Index: php4/main/php.h
diff -u php4/main/php.h:1.182 php4/main/php.h:1.183
--- php4/main/php.h:1.182 Mon Feb 17 08:29:56 2003
+++ php4/main/php.h Tue Feb 25 04:44:12 2003
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php.h,v 1.182 2003/02/17 13:29:56 zeev Exp $ */
+/* $Id: php.h,v 1.183 2003/02/25 09:44:12 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.14 php4/main/php_sprintf.c:1.15
--- php4/main/php_sprintf.c:1.14 Fri Jan 3 07:48:14 2003
+++ php4/main/php_sprintf.c Tue Feb 25 04:44:12 2003
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_sprintf.c,v 1.14 2003/01/03 12:48:14 hyanantha Exp $ */
+/* $Id: php_sprintf.c,v 1.15 2003/02/25 09:44:12 sniper Exp $ */
#include <stdio.h>
#include <stdarg.h>
@@ -43,7 +43,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.20 php4/main/snprintf.c:1.21
--- php4/main/snprintf.c:1.20 Wed Feb 19 03:40:19 2003
+++ php4/main/snprintf.c Tue Feb 25 04:44:12 2003
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: snprintf.c,v 1.20 2003/02/19 08:40:19 sniper Exp $ */
+/* $Id: snprintf.c,v 1.21 2003/02/25 09:44:12 sniper Exp $ */
/* ====================================================================
* Copyright (c) 1995-1998 The Apache Group. All rights reserved.
@@ -439,7 +439,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.20 php4/main/snprintf.h:1.21
--- php4/main/snprintf.h:1.20 Wed Feb 19 03:40:19 2003
+++ php4/main/snprintf.h Tue Feb 25 04:44:12 2003
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: snprintf.h,v 1.20 2003/02/19 08:40:19 sniper Exp $ */
+/* $Id: snprintf.h,v 1.21 2003/02/25 09:44:12 sniper Exp $ */
/*
@@ -64,12 +64,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
