From 79ec50f77d03175652cdcfe04ab69ec75364f250 Mon Sep 17 00:00:00 2001 From: David Shaw Date: Wed, 22 Feb 2006 02:11:35 +0000 Subject: * curl-shim.h, curl-shim.c (curl_easy_init, curl_easy_setopt, curl_easy_perform): Mingw has 'stderr' as a macro? --- keyserver/ChangeLog | 3 +++ keyserver/curl-shim.c | 6 +++--- keyserver/curl-shim.h | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/keyserver/ChangeLog b/keyserver/ChangeLog index 65b7f3fad..18a7a0de3 100644 --- a/keyserver/ChangeLog +++ b/keyserver/ChangeLog @@ -1,5 +1,8 @@ 2006-02-21 David Shaw + * curl-shim.h, curl-shim.c (curl_easy_init, curl_easy_setopt, + curl_easy_perform): Mingw has 'stderr' as a macro? + * curl-shim.h, curl-shim.c (curl_easy_init, curl_easy_setopt, curl_easy_perform): Add CURLOPT_VERBOSE and CURLOPT_STDERR for easier debugging. diff --git a/keyserver/curl-shim.c b/keyserver/curl-shim.c index fa38abab3..4a4d18f56 100644 --- a/keyserver/curl-shim.c +++ b/keyserver/curl-shim.c @@ -92,7 +92,7 @@ curl_easy_init(void) handle=calloc(1,sizeof(CURL)); if(handle) - handle->stderr=stderr; + handle->errors=stderr; return handle; } @@ -143,7 +143,7 @@ curl_easy_setopt(CURL *curl,CURLoption option,...) curl->flags.verbose=va_arg(ap,unsigned int); break; case CURLOPT_STDERR: - curl->stderr=va_arg(ap,FILE *); + curl->errors=va_arg(ap,FILE *); break; default: /* We ignore the huge majority of curl options */ @@ -175,7 +175,7 @@ curl_easy_perform(CURL *curl) proxy=getenv(HTTP_PROXY_ENV); if(curl->flags.verbose) - fprintf(curl->stderr,"* HTTP proxy is \"%s\"\n",proxy?proxy:"null"); + fprintf(curl->errors,"* HTTP proxy is \"%s\"\n",proxy?proxy:"null"); if(curl->flags.post) { diff --git a/keyserver/curl-shim.h b/keyserver/curl-shim.h index 7fee3b70f..91eac9d1e 100644 --- a/keyserver/curl-shim.h +++ b/keyserver/curl-shim.h @@ -66,7 +66,7 @@ typedef struct void *file; char *postfields; unsigned int status; - FILE *stderr; + FILE *errors; struct { unsigned int post:1; -- cgit v1.2.3