X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;ds=inline;f=lib%2Fsorter%2Fsorter.h;h=675a3d5b14fd21a0dbf5bd79f678c2a4e119e24c;hb=64a8f3287cdf40f4abe69a6e361b9a153961a348;hp=a0b6b39b76a1407fa7425f300bd0551b75cbac76;hpb=fe6dc0daa9980627429b4ece23a51f971dd9698a;p=libucw.git

diff --git a/lib/sorter/sorter.h b/lib/sorter/sorter.h
index a0b6b39b..675a3d5b 100644
--- a/lib/sorter/sorter.h
+++ b/lib/sorter/sorter.h
@@ -200,10 +200,7 @@ static inline void P(copy_merged)(P(key) **keys, struct fastbuf **data UNUSED, u
 #endif
 
 #include "lib/sorter/s-twoway.h"
-
-#ifndef SORT_UNIFY
 #include "lib/sorter/s-multiway.h"
-#endif
 
 #if defined(SORT_HASH_BITS) || defined(SORT_INT)
 #include "lib/sorter/s-radix.h"
@@ -272,10 +269,7 @@ static struct fastbuf *P(sort)(
   ctx.internal_sort = P(internal);
   ctx.internal_estimate = P(internal_estimate);
   ctx.twoway_merge = P(twoway_merge);
-
-#ifndef SORT_UNIFY
   ctx.multiway_merge = P(multiway_merge);
-#endif
 
   sorter_run(&ctx);