diff options
| author | Patrick Monnerat <Patrick.Monnerat@datasphere.ch> | 2007-08-07 12:44:38 +0000 |
|---|---|---|
| committer | Patrick Monnerat <Patrick.Monnerat@datasphere.ch> | 2007-08-07 12:44:38 +0000 |
| commit | ad9cb40b6f0fc79a1fddd9fa6aa12bf1dd31092b (patch) | |
| tree | 2e360e401f7df17ab9b5b0003550de4d3d54e364 | |
| parent | 2e60ca382dbe99bd294641dabf7e84a349b080c8 (diff) | |
Some #if --> #ifdef
undef standard *printf before (re)defining them
| -rw-r--r-- | include/curl/mprintf.h | 10 | ||||
| -rw-r--r-- | lib/ssluse.c | 2 | ||||
| -rw-r--r-- | lib/strtoofft.h | 2 |
3 files changed, 12 insertions, 2 deletions
diff --git a/include/curl/mprintf.h b/include/curl/mprintf.h index b087d9a80..5c526882f 100644 --- a/include/curl/mprintf.h +++ b/include/curl/mprintf.h @@ -44,6 +44,16 @@ CURL_EXTERN char *curl_maprintf(const char *format, ...); CURL_EXTERN char *curl_mvaprintf(const char *format, va_list args); #ifdef _MPRINTF_REPLACE +# undef printf +# undef fprintf +# undef sprintf +# undef vsprintf +# undef snprintf +# undef vprintf +# undef vfprintf +# undef vsnprintf +# undef aprintf +# undef vaprintf # define printf curl_mprintf # define fprintf curl_mfprintf #ifdef CURLDEBUG diff --git a/lib/ssluse.c b/lib/ssluse.c index f10002eca..d15cd71a1 100644 --- a/lib/ssluse.c +++ b/lib/ssluse.c @@ -125,7 +125,7 @@ static char global_passwd[64]; #endif static int passwd_callback(char *buf, int num, int verify -#if HAVE_USERDATA_IN_PWD_CALLBACK +#ifdef HAVE_USERDATA_IN_PWD_CALLBACK /* This was introduced in 0.9.4, we can set this using SSL_CTX_set_default_passwd_cb_userdata() */ diff --git a/lib/strtoofft.h b/lib/strtoofft.h index e27b43261..7ebe4f050 100644 --- a/lib/strtoofft.h +++ b/lib/strtoofft.h @@ -39,7 +39,7 @@ * 'strtoofft' such that it can be used to work with curl_off_t's regardless. */ #if (SIZEOF_CURL_OFF_T > 4) && (SIZEOF_LONG < 8) -#if HAVE_STRTOLL +#ifdef HAVE_STRTOLL #define curlx_strtoofft strtoll #else /* HAVE_STRTOLL */ |