fmk Mon Nov 15 18:14:43 2004 EDT
Modified files: (Branch: PHP_5_0)
/php-src/main php.h php_sprintf.c snprintf.c snprintf.h
Log:
Fix win32 build.
http://cvs.php.net/diff.php/php-src/main/php.h?r1=1.203.2.2&r2=1.203.2.3&ty=u
Index: php-src/main/php.h
diff -u php-src/main/php.h:1.203.2.2 php-src/main/php.h:1.203.2.3
--- php-src/main/php.h:1.203.2.2 Mon Nov 15 08:41:41 2004
+++ php-src/main/php.h Mon Nov 15 18:14:39 2004
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php.h,v 1.203.2.2 2004/11/15 13:41:41 derick Exp $ */
+/* $Id: php.h,v 1.203.2.3 2004/11/15 23:14:39 fmk Exp $ */
#ifndef PHP_H
#define PHP_H
@@ -234,7 +234,9 @@
#define PHP_ATTRIBUTE_MALLOC ZEND_ATTRIBUTE_MALLOC
#define PHP_ATTRIBUTE_FORMAT ZEND_ATTRIBUTE_FORMAT
+BEGIN_EXTERN_C()
#include "snprintf.h"
+END_EXTERN_C()
#include "spprintf.h"
#define EXEC_INPUT_BUF 4096
http://cvs.php.net/diff.php/php-src/main/php_sprintf.c?r1=1.17.2.1&r2=1.17.2.2&ty=u
Index: php-src/main/php_sprintf.c
diff -u php-src/main/php_sprintf.c:1.17.2.1 php-src/main/php_sprintf.c:1.17.2.2
--- php-src/main/php_sprintf.c:1.17.2.1 Mon Nov 15 08:41:41 2004
+++ php-src/main/php_sprintf.c Mon Nov 15 18:14:40 2004
@@ -16,17 +16,20 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_sprintf.c,v 1.17.2.1 2004/11/15 13:41:41 derick Exp $ */
+/* $Id: php_sprintf.c,v 1.17.2.2 2004/11/15 23:14:40 fmk Exp $ */
#include <stdio.h>
#include <stdarg.h>
-#ifdef NETWARE
+#include "php.h"
+#ifdef PHP_WIN32
+#include "config.w32.h"
+#elif defined NETWARE
#include "config.nw.h"
#else
#include "php_config.h"
#endif
-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.34.2.1&r2=1.34.2.2&ty=u
Index: php-src/main/snprintf.c
diff -u php-src/main/snprintf.c:1.34.2.1 php-src/main/snprintf.c:1.34.2.2
--- php-src/main/snprintf.c:1.34.2.1 Mon Nov 15 08:41:41 2004
+++ php-src/main/snprintf.c Mon Nov 15 18:14:40 2004
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: snprintf.c,v 1.34.2.1 2004/11/15 13:41:41 derick Exp $ */
+/* $Id: snprintf.c,v 1.34.2.2 2004/11/15 23:14:40 fmk Exp $ */
/* ====================================================================
* Copyright (c) 1995-1998 The Apache Group. All rights reserved.
@@ -1135,7 +1135,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;
@@ -1147,7 +1147,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.27.2.1&r2=1.27.2.2&ty=u
Index: php-src/main/snprintf.h
diff -u php-src/main/snprintf.h:1.27.2.1 php-src/main/snprintf.h:1.27.2.2
--- php-src/main/snprintf.h:1.27.2.1 Mon Nov 15 08:41:41 2004
+++ php-src/main/snprintf.h Mon Nov 15 18:14:40 2004
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: snprintf.h,v 1.27.2.1 2004/11/15 13:41:41 derick Exp $ */
+/* $Id: snprintf.h,v 1.27.2.2 2004/11/15 23:14:40 fmk Exp $ */
/*
@@ -64,13 +64,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
