MFH: Fix win32 build.

diff --git a/main/php_sprintf.c b/main/php_sprintf.c
index 9db5c0de680d63a0830161932b9f60dac09c9b93..6fe98be5a63d0928350122b5a8944474613e599d 100644 (file)
--- a/main/php_sprintf.c
+++ b/main/php_sprintf.c
@@ -20,9 +20,9 @@
 
 #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;

diff --git a/main/snprintf.c b/main/snprintf.c
index 177ef4635684ce5bd0264491953453d6ad6f5a6a..fd5ed37f18733d3f010eadab0734c794d806483a 100644 (file)
--- a/main/snprintf.c
+++ b/main/snprintf.c
@@ -966,7 +966,7 @@ static void strx_printv(int *ccp, char *buf, size_t len, const char *format,
 }
 
 
-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_snprintf(char *buf, size_t len, const char *format,...)
 }
 
 
-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;
 

diff --git a/main/snprintf.h b/main/snprintf.h
index 75ddb7968bb72f92c610224371cdaa1e783cfcc3..343f5857e251ff9ac3ef34572294ce2fe1b46ea2 100644 (file)
--- a/main/snprintf.h
+++ b/main/snprintf.h
@@ -62,13 +62,22 @@ Example:
 #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 {