From f471a293ea995aa071e016d25388e9e26e43b6c0 Mon Sep 17 00:00:00 2001 From: Gisle Vanem Date: Mon, 8 Nov 2004 14:20:14 +0000 Subject: [PATCH] Un-do changes for WinCE; cdecl decoration is not needed. Confirmed by Paul Nolan. --- lib/mprintf.c | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/lib/mprintf.c b/lib/mprintf.c index 4650961d1..a9b601c9c 100644 --- a/lib/mprintf.c +++ b/lib/mprintf.c @@ -40,12 +40,6 @@ #include -#ifdef _WIN32_WCE -#define CURL_CDECL __cdecl -#else -#define CURL_CDECL -#endif - #ifndef SIZEOF_LONG_DOUBLE #define SIZEOF_LONG_DOUBLE 0 #endif @@ -589,12 +583,7 @@ static int dprintf_formatf( void *data, /* untouched by format(), just sent to the stream() function in the second argument */ /* function pointer called for each output character */ - -#ifdef _WIN32_WCE - int (__cdecl *stream) (int, FILE *), -#else int (*stream)(int, FILE *), -#endif const char *format, /* %-formatted string */ va_list ap_save) /* list of parameters */ { @@ -990,7 +979,7 @@ static int dprintf_formatf( } /* fputc() look-alike */ -static int CURL_CDECL addbyter(int output, FILE *data) +static int addbyter(int output, FILE *data) { struct nsprintf *infop=(struct nsprintf *)data; unsigned char outc = (unsigned char)output; @@ -1038,7 +1027,7 @@ int curl_msnprintf(char *buffer, size_t maxlength, const char *format, ...) } /* fputc() look-alike */ -static int CURL_CDECL alloc_addbyter(int output, FILE *data) +static int alloc_addbyter(int output, FILE *data) { struct asprintf *infop=(struct asprintf *)data; unsigned char outc = (unsigned char)output; @@ -1124,7 +1113,7 @@ char *curl_mvaprintf(const char *format, va_list ap_save) return strdup(""); } -static int CURL_CDECL storebuffer(int output, FILE *data) +static int storebuffer(int output, FILE *data) { char **buffer = (char **)data; unsigned char outc = (unsigned char)output;