Commit ad9cb40b authored by Patrick Monnerat's avatar Patrick Monnerat
Browse files

Some #if --> #ifdef 

undef standard *printf before (re)defining them
parent 2e60ca38

include/curl/mprintf.h

+10 −0
Original line number Diff line number Diff line
@@ -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

lib/ssluse.c

+1 −1
Original line number Diff line number Diff line
@@ -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()

                              */

lib/strtoofft.h

+1 −1
Original line number Diff line number Diff line
@@ -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 */