Convert the most important users of arraysort.h to sorter/array.h.

[libucw.git] / lib / sorter / s-fixint.h

diff --git a/lib/sorter/s-fixint.h b/lib/sorter/s-fixint.h
index de152b0a90422d5fae4bd56de7d4c1e9eb68a188..9787a682010b1a8c88659acd4eb4543a6daca8bc 100644 (file)
--- a/lib/sorter/s-fixint.h
+++ b/lib/sorter/s-fixint.h
@@ -13,7 +13,10 @@
 #define ASORT_KEY_TYPE P(key)
 #define ASORT_LT(x,y) (P(compare)(&(x), &(y)) < 0)
 #ifdef SORT_INTERNAL_RADIX
 #define ASORT_KEY_TYPE P(key)
 #define ASORT_LT(x,y) (P(compare)(&(x), &(y)) < 0)
 #ifdef SORT_INTERNAL_RADIX

-#define ASORT_HASH(x) P(hash)(&(x))
+#  define ASORT_HASH(x) P(hash)(&(x))
+#    ifdef SORT_LONG_HASH
+#      define ASORT_LONG_HASH
+#    endif

 #endif
 #include "lib/sorter/array.h"
 
 #endif
 #include "lib/sorter/array.h"
 


@@ -69,11 +72,9 @@ static int P(internal)(struct sort_context *ctx, struct sort_bucket *bin, struct
        stk_fsize(n * P(internal_workspace)()));
   timestamp_t timer;
   init_timer(&timer);
        stk_fsize(n * P(internal_workspace)()));
   timestamp_t timer;
   init_timer(&timer);

-  buf = P(array_sort)(buf, n,
+  buf = P(array_sort)(buf, n

 #ifdef SORT_INTERNAL_RADIX
 #ifdef SORT_INTERNAL_RADIX

-    workspace, bin->hash_bits
-#else
-    NULL, 0
+    , workspace, bin->hash_bits

 #endif
     );
   ctx->total_int_time += get_timer(&timer);
 #endif
     );
   ctx->total_int_time += get_timer(&timer);