generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Some #if --> #ifdef

Browse Source 
undef standard *printf before (re)defining them
This commit is contained in:
Patrick Monnerat
2007-08-07 12:44:38 +00:00
parent 2e60ca382d
commit ad9cb40b6f
3 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
include/curl/mprintf.h
View File

@@ -44,6 +44,16 @@ CURL_EXTERN char *curl_maprintf(const char *format, ...);
CURL_EXTERN char *curl_mvaprintf(const char *format, va_list args); CURL_EXTERN char *curl_mvaprintf(const char *format, va_list args);
#ifdef _MPRINTF_REPLACE #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 printf curl_mprintf
# define fprintf curl_mfprintf # define fprintf curl_mfprintf
#ifdef CURLDEBUG #ifdef CURLDEBUG

2
lib/ssluse.c
View File

@@ -125,7 +125,7 @@ static char global_passwd[64];
#endif #endif
static int passwd_callback(char *buf, int num, int verify 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 /* This was introduced in 0.9.4, we can set this
using SSL_CTX_set_default_passwd_cb_userdata() using SSL_CTX_set_default_passwd_cb_userdata()
*/ */

2
lib/strtoofft.h
View File

@@ -39,7 +39,7 @@
* 'strtoofft' such that it can be used to work with curl_off_t's regardless. * '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 (SIZEOF_CURL_OFF_T > 4) && (SIZEOF_LONG < 8)
#if HAVE_STRTOLL #ifdef HAVE_STRTOLL
#define curlx_strtoofft strtoll #define curlx_strtoofft strtoll
#else /* HAVE_STRTOLL */ #else /* HAVE_STRTOLL */