The old sorter is gone.

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

diff --git a/lib/sorter/sorter.h b/lib/sorter/sorter.h
index 675a3d5b14fd21a0dbf5bd79f678c2a4e119e24c..971e6e67b91d9102d837f4aa06ff13afc70ab887 100644 (file)
--- a/lib/sorter/sorter.h
+++ b/lib/sorter/sorter.h
@@ -131,6 +131,7 @@ typedef SORT_KEY P(key);
 #ifdef SORT_INT64
 typedef u64 P(hash_t);
 #define SORT_INT SORT_INT64
 #ifdef SORT_INT64
 typedef u64 P(hash_t);
 #define SORT_INT SORT_INT64

+#define SORT_LONG_HASH

 #else
 typedef uns P(hash_t);
 #endif
 #else
 typedef uns P(hash_t);
 #endif


@@ -193,6 +194,11 @@ static inline void P(copy_merged)(P(key) **keys, struct fastbuf **data UNUSED, u
 }
 #endif
 
 }
 #endif
 

+#if defined(SORT_HASH_BITS) || defined(SORT_INT)
+#define SORT_INTERNAL_RADIX
+#include "lib/sorter/s-radix.h"
+#endif
+

 #if defined(SORT_VAR_KEY) || defined(SORT_VAR_DATA) || defined(SORT_UNIFY_WORKSPACE)
 #include "lib/sorter/s-internal.h"
 #else
 #if defined(SORT_VAR_KEY) || defined(SORT_VAR_DATA) || defined(SORT_UNIFY_WORKSPACE)
 #include "lib/sorter/s-internal.h"
 #else


@@ -202,10 +208,6 @@ static inline void P(copy_merged)(P(key) **keys, struct fastbuf **data UNUSED, u
 #include "lib/sorter/s-twoway.h"
 #include "lib/sorter/s-multiway.h"
 
 #include "lib/sorter/s-twoway.h"
 #include "lib/sorter/s-multiway.h"
 

-#if defined(SORT_HASH_BITS) || defined(SORT_INT)
-#include "lib/sorter/s-radix.h"
-#endif
-

 static struct fastbuf *P(sort)(
 #ifdef SORT_INPUT_FILE
                               byte *in,
 static struct fastbuf *P(sort)(
 #ifdef SORT_INPUT_FILE
                               byte *in,


@@ -301,6 +303,8 @@ static struct fastbuf *P(sort)(
 #undef SORT_UNIQUE
 #undef SORT_ASSERT_UNIQUE
 #undef SORT_DELETE_INPUT
 #undef SORT_UNIQUE
 #undef SORT_ASSERT_UNIQUE
 #undef SORT_DELETE_INPUT

+#undef SORT_INTERNAL_RADIX
+#undef SORT_LONG_HASH

 #undef SWAP
 #undef LESS
 #undef P
 #undef SWAP
 #undef LESS
 #undef P