Index: ossp-pkg/popt/popt.c RCS File: /v/ossp/cvs/ossp-pkg/popt/popt.c,v rcsdiff -q -kk '-r1.4' '-r1.5' -u '/v/ossp/cvs/ossp-pkg/popt/popt.c,v' 2>/dev/null --- popt.c 2003/02/06 15:05:36 1.4 +++ popt.c 2003/02/06 15:06:28 1.5 @@ -1037,10 +1037,10 @@ *((double *)opt->arg) = aDouble; } else { -#define _ABS(a) ((((a) - 0.0) < DBL_EPSILON) ? -(a) : (a)) - if ((_ABS(aDouble) - FLT_MAX) > DBL_EPSILON) +#define POPT_ABS(a) ((((a) - 0.0) < DBL_EPSILON) ? -(a) : (a)) + if ((POPT_ABS(aDouble) - FLT_MAX) > DBL_EPSILON) return POPT_ERROR_OVERFLOW; - if ((FLT_MIN - _ABS(aDouble)) > DBL_EPSILON) + if ((FLT_MIN - POPT_ABS(aDouble)) > DBL_EPSILON) return POPT_ERROR_OVERFLOW; *((float *)opt->arg) = aDouble; }