Paul Nolan fix to make libcurl build nicely on Windows CE

This commit is contained in:
Daniel Stenberg 2004-11-02 10:12:22 +00:00
parent 8a66584db4
commit 24d47a6e07
22 changed files with 385 additions and 20 deletions

View file

@ -40,6 +40,12 @@
#include <curl/mprintf.h>
#ifdef _WIN32_WCE
#define CURL_CDECL __cdecl
#else
#define CURL_CDECL
#endif
#ifndef SIZEOF_LONG_DOUBLE
#define SIZEOF_LONG_DOUBLE 0
#endif
@ -583,7 +589,12 @@ 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 */
#if _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 */
{
@ -979,7 +990,7 @@ static int dprintf_formatf(
}
/* fputc() look-alike */
static int addbyter(int output, FILE *data)
static int CURL_CDECL addbyter(int output, FILE *data)
{
struct nsprintf *infop=(struct nsprintf *)data;
unsigned char outc = (unsigned char)output;
@ -1027,7 +1038,7 @@ int curl_msnprintf(char *buffer, size_t maxlength, const char *format, ...)
}
/* fputc() look-alike */
static int alloc_addbyter(int output, FILE *data)
static int CURL_CDECL alloc_addbyter(int output, FILE *data)
{
struct asprintf *infop=(struct asprintf *)data;
unsigned char outc = (unsigned char)output;
@ -1113,7 +1124,7 @@ char *curl_mvaprintf(const char *format, va_list ap_save)
return strdup("");
}
static int storebuffer(int output, FILE *data)
static int CURL_CDECL storebuffer(int output, FILE *data)
{
char **buffer = (char **)data;
unsigned char outc = (unsigned char)output;
@ -1142,6 +1153,7 @@ int curl_mprintf(const char *format, ...)
int retcode;
va_list ap_save; /* argument pointer */
va_start(ap_save, format);
retcode = dprintf_formatf(stdout, fputc, format, ap_save);
va_end(ap_save);
return retcode;