Author: jpeach Date: 2006-06-23 06:19:45 +0000 (Fri, 23 Jun 2006) New Revision: 16484
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=16484 Log: Bugzilla 3805. Only define _ABS if it is not already defined. Modified: branches/SAMBA_3_0/source/popt/popt.c trunk/source/popt/popt.c Changeset: Modified: branches/SAMBA_3_0/source/popt/popt.c =================================================================== --- branches/SAMBA_3_0/source/popt/popt.c 2006-06-23 06:00:16 UTC (rev 16483) +++ branches/SAMBA_3_0/source/popt/popt.c 2006-06-23 06:19:45 UTC (rev 16484) @@ -927,7 +927,9 @@ if ((opt->argInfo & POPT_ARG_MASK) == POPT_ARG_DOUBLE) { *((double *) opt->arg) = aDouble; } else { +#ifndef _ABS #define _ABS(a) ((((a) - 0.0) < DBL_EPSILON) ? -(a) : (a)) +#endif if ((_ABS(aDouble) - FLT_MAX) > DBL_EPSILON) return POPT_ERROR_OVERFLOW; if ((FLT_MIN - _ABS(aDouble)) > DBL_EPSILON) Modified: trunk/source/popt/popt.c =================================================================== --- trunk/source/popt/popt.c 2006-06-23 06:00:16 UTC (rev 16483) +++ trunk/source/popt/popt.c 2006-06-23 06:19:45 UTC (rev 16484) @@ -927,7 +927,9 @@ if ((opt->argInfo & POPT_ARG_MASK) == POPT_ARG_DOUBLE) { *((double *) opt->arg) = aDouble; } else { +#ifndef _ABS #define _ABS(a) ((((a) - 0.0) < DBL_EPSILON) ? -(a) : (a)) +#endif if ((_ABS(aDouble) - FLT_MAX) > DBL_EPSILON) return POPT_ERROR_OVERFLOW; if ((FLT_MIN - _ABS(aDouble)) > DBL_EPSILON)
