fmk Mon Nov 15 18:27:26 2004 EDT
Modified files: (Branch: PHP_4_3)
/php-src/main php_sprintf.c snprintf.c snprintf.h
Log:
MFH: Fix win32 build.
http://cvs.php.net/diff.php/php-src/main/php_sprintf.c?r1=1.12.8.3&r2=1.12.8.4&ty=u
Index: php-src/main/php_sprintf.c
diff -u php-src/main/php_sprintf.c:1.12.8.3 php-src/main/php_sprintf.c:1.12.8.4
--- php-src/main/php_sprintf.c:1.12.8.3 Mon Nov 15 08:40:31 2004
+++ php-src/main/php_sprintf.c Mon Nov 15 18:27:26 2004
@@ -16,13 +16,13 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_sprintf.c,v 1.12.8.3 2004/11/15 13:40:31 derick Exp $ */
+/* $Id: php_sprintf.c,v 1.12.8.4 2004/11/15 23:27:26 fmk Exp $ */
#include <stdio.h>
#include <stdarg.h>
-#include "php_config.h"
+#include "php.h"
-int
+PHPAPI int
php_sprintf (char*s, const char* format, ...)
{
va_list args;
http://cvs.php.net/diff.php/php-src/main/snprintf.c?r1=1.17.4.10&r2=1.17.4.11&ty=u
Index: php-src/main/snprintf.c
diff -u php-src/main/snprintf.c:1.17.4.10 php-src/main/snprintf.c:1.17.4.11
--- php-src/main/snprintf.c:1.17.4.10 Mon Nov 15 08:40:31 2004
+++ php-src/main/snprintf.c Mon Nov 15 18:27:26 2004
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: snprintf.c,v 1.17.4.10 2004/11/15 13:40:31 derick Exp $ */
+/* $Id: snprintf.c,v 1.17.4.11 2004/11/15 23:27:26 fmk Exp $ */
/* ====================================================================
* Copyright (c) 1995-1998 The Apache Group. All rights reserved.
@@ -966,7 +966,7 @@
}
-int ap_php_snprintf(char *buf, size_t len, const char *format,...)
+PHPAPI int ap_php_snprintf(char *buf, size_t len, const char *format,...)
{
int cc;
va_list ap;
@@ -978,7 +978,7 @@
}
-int ap_php_vsnprintf(char *buf, size_t len, const char *format, va_list ap)
+PHPAPI int ap_php_vsnprintf(char *buf, size_t len, const char *format, va_list
ap)
{
int cc;
http://cvs.php.net/diff.php/php-src/main/snprintf.h?r1=1.18.4.4&r2=1.18.4.5&ty=u
Index: php-src/main/snprintf.h
diff -u php-src/main/snprintf.h:1.18.4.4 php-src/main/snprintf.h:1.18.4.5
--- php-src/main/snprintf.h:1.18.4.4 Mon Nov 15 08:40:31 2004
+++ php-src/main/snprintf.h Mon Nov 15 18:27:26 2004
@@ -62,13 +62,22 @@
#ifndef SNPRINTF_H
#define SNPRINTF_H
-int ap_php_snprintf(char *, size_t, const char *, ...)
PHP_ATTRIBUTE_FORMAT(printf, 3, 4);
+PHPAPI int ap_php_snprintf(char *, size_t, const char *, ...)
PHP_ATTRIBUTE_FORMAT(printf, 3, 4);
+#ifdef snprintf
+#undef snprintf
+#endif
#define snprintf ap_php_snprintf
-int ap_php_vsnprintf(char *, size_t, const char *, va_list ap)
PHP_ATTRIBUTE_FORMAT(printf, 3, 0);
+PHPAPI int ap_php_vsnprintf(char *, size_t, const char *, va_list ap)
PHP_ATTRIBUTE_FORMAT(printf, 3, 0);
+#ifdef vsnprintf
+#undef vsnprintf
+#endif
#define vsnprintf ap_php_vsnprintf
-int php_sprintf (char* s, const char* format, ...)
PHP_ATTRIBUTE_FORMAT(printf, 2, 3);
+PHPAPI int php_sprintf (char* s, const char* format, ...)
PHP_ATTRIBUTE_FORMAT(printf, 2, 3);
+#ifdef sprintf
+#undef sprintf
+#endif
#define sprintf php_sprintf
typedef enum {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
