From 00a0b0cbf358d5c53f64b239df381c73f277a65b Mon Sep 17 00:00:00 2001
From: James Peach <jpeach@samba.org>
Date: Fri, 23 Jun 2006 06:19:45 +0000
Subject: r16484: Bugzilla 3805. Only define _ABS if it is not already defined.
 (This used to be commit 09fb20f4fe26a5ec82e2f296bf033ab0864af669)

---
 source3/popt/popt.c | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'source3/popt/popt.c')

diff --git a/source3/popt/popt.c b/source3/popt/popt.c
index e9c4c17de5..ce3687fb64 100644
--- a/source3/popt/popt.c
+++ b/source3/popt/popt.c
@@ -927,7 +927,9 @@ int poptGetNextOpt(poptContext con)
 		    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)
-- 
cgit