From: Wayne Davison Date: Thu, 9 Nov 2006 01:55:17 +0000 (+0000) Subject: Changed _ABS to be defined as MY_ABS. X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/commitdiff_plain/1acb2e15b49b50d5be5320ad6bd41291130bc438 Changed _ABS to be defined as MY_ABS. --- diff --git a/popt/popt.c b/popt/popt.c index fcf671ca..00a60270 100644 --- a/popt/popt.c +++ b/popt/popt.c @@ -965,10 +965,10 @@ int poptGetNextOpt(poptContext con) if ((opt->argInfo & POPT_ARG_MASK) == POPT_ARG_DOUBLE) { *((double *) opt->arg) = aDouble; } else { -#define _ABS(a) ((((a) - 0.0) < DBL_EPSILON) ? -(a) : (a)) - if ((_ABS(aDouble) - FLT_MAX) > DBL_EPSILON) +#define MY_ABS(a) ((((a) - 0.0) < DBL_EPSILON) ? -(a) : (a)) + if ((MY_ABS(aDouble) - FLT_MAX) > DBL_EPSILON) return POPT_ERROR_OVERFLOW; - if ((FLT_MIN - _ABS(aDouble)) > DBL_EPSILON) + if ((FLT_MIN - MY_ABS(aDouble)) > DBL_EPSILON) return POPT_ERROR_OVERFLOW; *((float *) opt->arg) = aDouble; }