Cleaned up joining logic and implemented joins in multi-way merges.

[libucw.git] / lib / sorter / common.h

diff --git a/lib/sorter/common.h b/lib/sorter/common.h
index 8b87ed90b4414b9e8c46374c09fdf84e80fd10ec..70e10c08f84a620dc19a4c6d10e9fff9b226d8b8 100644 (file)
--- a/lib/sorter/common.h
+++ b/lib/sorter/common.h
@@ -15,6 +15,7 @@
 /* Configuration, some of the variables are used by the old sorter, too. */
 extern uns sorter_trace, sorter_presort_bufsize, sorter_stream_bufsize;
 extern uns sorter_debug, sorter_min_radix_bits, sorter_max_radix_bits;
+extern uns sorter_min_multiway_bits, sorter_max_multiway_bits;
 extern u64 sorter_bufsize;
 extern struct fb_params sorter_fb_params;
 
@@ -112,6 +113,5 @@ sh_off_t sbuck_size(struct sort_bucket *b);
 struct fastbuf *sbuck_read(struct sort_bucket *b);
 struct fastbuf *sbuck_write(struct sort_bucket *b);
 void sbuck_swap_out(struct sort_bucket *b);
-void format_size(byte *buf, u64 x);
 
 #endif