Added RERR_VANISHED.

[rsync/rsync.git] / popt / popt.c

diff --git a/popt/popt.c b/popt/popt.c
index 962f973..d17c31c 100644 (file)
--- a/popt/popt.c
+++ b/popt/popt.c
@@ -904,6 +904,9 @@ int poptGetNextOpt(poptContext con)
                    if ((opt->argInfo & POPT_ARG_MASK) == POPT_ARG_DOUBLE) {
                        *((double *) opt->arg) = aDouble;
                    } else {
+#ifndef DBL_EPSILON
+#define DBL_EPSILON 2.2204460492503131e-16
+#endif
 #define _ABS(a)        ((((a) - 0.0) < DBL_EPSILON) ? -(a) : (a))
                        if ((_ABS(aDouble) - FLT_MAX) > DBL_EPSILON)
                            return POPT_ERROR_OVERFLOW;
@@ -1054,7 +1057,7 @@ poptContext poptFreeContext(poptContext con)
 int poptAddAlias(poptContext con, struct poptAlias alias,
                /*@unused@*/ int flags)
 {
-    poptItem item = alloca(sizeof(*item));
+    poptItem item = (poptItem) alloca(sizeof(*item));
     memset(item, 0, sizeof(*item));
     item->option.longName = alias.longName;
     item->option.shortName = alias.shortName;