Index: include/curl/mprintf.h
===================================================================
RCS file: /cvsroot/curl/curl/include/curl/mprintf.h,v
retrieving revision 1.14
diff -u -r1.14 mprintf.h
--- include/curl/mprintf.h	30 Oct 2006 16:26:24 -0000	1.14
+++ include/curl/mprintf.h	12 Jun 2007 10:39:30 -0000
@@ -44,6 +44,16 @@
 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
Index: lib/ssluse.c
===================================================================
RCS file: /cvsroot/curl/curl/lib/ssluse.c,v
retrieving revision 1.180
diff -u -r1.180 ssluse.c
--- lib/ssluse.c	1 Aug 2007 21:20:01 -0000	1.180
+++ lib/ssluse.c	6 Aug 2007 12:19:06 -0000
@@ -125,7 +125,7 @@
 #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()
                               */
Index: lib/strtoofft.h
===================================================================
RCS file: /cvsroot/curl/curl/lib/strtoofft.h,v
retrieving revision 1.14
diff -u -r1.14 strtoofft.h
--- lib/strtoofft.h	17 Dec 2004 18:33:09 -0000	1.14
+++ lib/strtoofft.h	6 Aug 2007 09:59:10 -0000
@@ -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 */