X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fsorter%2Fsorter.h;h=89cf9f0df7f4e5b5160658d5a0b99f8747943ff7;hb=969ce845f3bf35bb7423bac705d46196bb863e72;hp=98dd8f776e3aa0bacc0e4423217c26a440ec328a;hpb=e65a1a48088af1a5731f64b50ba933f4c29d5040;p=libucw.git diff --git a/lib/sorter/sorter.h b/lib/sorter/sorter.h index 98dd8f77..89cf9f0d 100644 --- a/lib/sorter/sorter.h +++ b/lib/sorter/sorter.h @@ -172,7 +172,12 @@ static inline void P(copy_data)(P(key) *key, struct fastbuf *in, struct fastbuf #endif } +#if defined(SORT_VAR_KEY) || defined(SORT_VAR_DATA) || defined(SORT_UNIFY) #include "lib/sorter/s-internal.h" +#else +#include "lib/sorter/s-fixint.h" +#endif + #include "lib/sorter/s-twoway.h" #if defined(SORT_HASH_BITS) || defined(SORT_INT) @@ -236,6 +241,7 @@ static struct fastbuf *P(sort)( #endif ctx.internal_sort = P(internal); + ctx.internal_estimate = P(internal_estimate); ctx.twoway_merge = P(twoway_merge); sorter_run(&ctx);