X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/bc93ee842fd5dd2a1cc2b2cb25656a98c673d772..65e83e097c8635856816a07bab5e330a6615dfc1:/popt/popt.c

diff --git a/popt/popt.c b/popt/popt.c
index 9ce3b355..756ddfee 100644
--- a/popt/popt.c
+++ b/popt/popt.c
@@ -18,6 +18,10 @@
 #include "findme.h"
 #include "poptint.h"
 
+#ifndef DBL_EPSILON
+#define DBL_EPSILON 2.2204460492503131e-16
+#endif
+
 #ifdef	MYDEBUG
 /*@unchecked@*/
 int _popt_debug = 0;
@@ -467,7 +471,7 @@ if (_popt_debug)
     }
 #endif
 
-    rc = execvp(argv[0], (char *const *)argv);
+    execvp(argv[0], (char *const *)argv);
 
     return POPT_ERROR_ERRNO;
 }
@@ -961,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;
 		    }