diff options
Diffstat (limited to 'lib/urldata.h')
| -rw-r--r-- | lib/urldata.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/lib/urldata.h b/lib/urldata.h index 9b81e69a6..899e154f6 100644 --- a/lib/urldata.h +++ b/lib/urldata.h @@ -110,10 +110,9 @@ /* Maximum number of dirs supported by libcurl in a FTP dir hierarchy */ #define CURL_MAX_FTP_DIRDEPTH 100 -/* Just a convenience macro to get the larger value out of two given */ -#ifndef MAX -#define MAX(x,y) ((x)>(y)?(x):(y)) -#endif +/* Just a convenience macro to get the larger value out of two given. + We prefix with CURL to prevent name collisions. */ +#define CURLMAX(x,y) ((x)>(y)?(x):(y)) #ifdef HAVE_KRB4 /* Types needed for krb4-ftp connections */ |