diff options
| author | Frank M. Kromann <fmk@php.net> | 2004-11-15 23:27:26 +0000 |
|---|---|---|
| committer | Frank M. Kromann <fmk@php.net> | 2004-11-15 23:27:26 +0000 |
| commit | 0e33da898fae0b0092c1fa6cd9a344c447b57f78 (patch) | |
| tree | d6f6044d85a6b8d5778e0530e7f3b4c9682831ac | |
| parent | e018da1aa31c9f24525f8a735cddfe586fd4bade (diff) | |
| download | php-git-0e33da898fae0b0092c1fa6cd9a344c447b57f78.tar.gz | |
MFH: Fix win32 build.
| -rw-r--r-- | main/php_sprintf.c | 4 | ||||
| -rw-r--r-- | main/snprintf.c | 4 | ||||
| -rw-r--r-- | main/snprintf.h | 15 |
3 files changed, 16 insertions, 7 deletions
diff --git a/main/php_sprintf.c b/main/php_sprintf.c index 9db5c0de68..6fe98be5a6 100644 --- 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 177ef46356..fd5ed37f18 100644 --- 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 75ddb7968b..343f5857e2 100644 --- 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 { |