X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fstats%2Faggregate.c;h=648e8896b64bd2b6c6f8ca8ed9e7bfb49e12ff4b;hb=19d0debdc5b72e1bb6c79956403a4d3bc054f300;hp=031a84f8657d59cd4ba2b16143f4ff2e1e92d399;hpb=5819d4ec857165ed6e0570688bf3df76027f2cf2;p=pspp-builds.git

diff --git a/src/language/stats/aggregate.c b/src/language/stats/aggregate.c
index 031a84f8..648e8896 100644
--- a/src/language/stats/aggregate.c
+++ b/src/language/stats/aggregate.c
@@ -46,6 +46,8 @@
 #include <math/moments.h>
 #include <math/sort.h>
 
+#include "minmax.h"
+
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
 
@@ -809,7 +811,7 @@ accumulate_aggregate_info (struct agr_proc *agr,
             moments1_add (iter->moments, v->f, weight);
             break;
 	  case MAX:
-	    iter->dbl[0] = max (iter->dbl[0], v->f);
+	    iter->dbl[0] = MAX (iter->dbl[0], v->f);
 	    iter->int1 = 1;
 	    break;
 	  case MAX | FSTRING:
@@ -818,7 +820,7 @@ accumulate_aggregate_info (struct agr_proc *agr,
 	    iter->int1 = 1;
 	    break;
 	  case MIN:
-	    iter->dbl[0] = min (iter->dbl[0], v->f);
+	    iter->dbl[0] = MIN (iter->dbl[0], v->f);
 	    iter->int1 = 1;
 	    break;
 	  case MIN | FSTRING: