Some #if --> #ifdef

undef standard *printf before (re)defining them

diff --git a/include/curl/mprintf.h b/include/curl/mprintf.h
index b087d9a80981a35619363bd22352ff971953eaca..5c526882f9346809e336cf4b429dcadd3be1243a 100644 (file)
--- 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 f10002ecad51948d583d1ab56c716e9741ffa8b3..d15cd71a18be673d9d6b99d0cae7653040a1f669 100644 (file)
--- 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 e27b43261fb90fc391b8ffbdc68f0bcf969a7a81..7ebe4f050546f7f9617e51b928afecd1530e9414 100644 (file)
--- 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 */