projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
We've had a mix of min, max from libpspp/misc.h and MIN, MAX from
[pspp-builds.git]
/
src
/
language
/
stats
/
aggregate.c
diff --git
a/src/language/stats/aggregate.c
b/src/language/stats/aggregate.c
index 031a84f8657d59cd4ba2b16143f4ff2e1e92d399..648e8896b64bd2b6c6f8ca8ed9e7bfb49e12ff4b 100644
(file)
--- 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 <math/moments.h>
#include <math/sort.h>
+#include "minmax.h"
+
#include "gettext.h"
#define _(msgid) gettext (msgid)
#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:
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:
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->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:
iter->int1 = 1;
break;
case MIN | FSTRING: