Changed _ABS to be defined as MY_ABS.
authorWayne Davison <wayned@samba.org>
Thu, 9 Nov 2006 01:55:17 +0000 (01:55 +0000)
committerWayne Davison <wayned@samba.org>
Thu, 9 Nov 2006 01:55:17 +0000 (01:55 +0000)
popt/popt.c

index fcf671caf941bd4fcd6a9be02317e7ee9b80157f..00a60270f3b13c509096a58b7d842cd45d58391e 100644 (file)
@@ -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;
                    }