We've had a mix of min, max from libpspp/misc.h and MIN, MAX from

[pspp-builds.git] / src / math / sort.c

diff --git a/src/math/sort.c b/src/math/sort.c
index 9f5e5fb956a4c94f31f78bd03139c78fd3742126..827c2314f2e6e54ceab3a3cb597fbc8287993e31 100644 (file)
--- a/src/math/sort.c
+++ b/src/math/sort.c
@@ -44,6 +44,8 @@
 #include <libpspp/misc.h>
 #include <libpspp/str.h>
 
+#include "minmax.h"
+
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
 
@@ -587,7 +589,7 @@ merge (struct external_sort *xsrt)
 {
   while (xsrt->run_cnt > 1)
     {
-      int order = min (MAX_MERGE_ORDER, xsrt->run_cnt);
+      int order = MIN (MAX_MERGE_ORDER, xsrt->run_cnt);
       int idx = choose_merge (xsrt->runs, xsrt->run_cnt, order);
       xsrt->runs[idx] = merge_once (xsrt, xsrt->runs + idx, order);
       remove_range (xsrt->runs, xsrt->run_cnt, sizeof *xsrt->runs,