X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=lib%2Fsorter%2Farray.h;h=04a27d77e79e52cfbac7db5b82b4c9a01897f573;hb=b20998a1656dafd2cf694b7f4d5807d8321db43a;hp=0f18741b451d1f4a1223c5817b29ac78a6726dcb;hpb=1f1ccf1786a62973de953e3f5c43392ad485770d;p=libucw.git

diff --git a/lib/sorter/array.h b/lib/sorter/array.h
index 0f18741b..04a27d77 100644
--- a/lib/sorter/array.h
+++ b/lib/sorter/array.h
@@ -23,7 +23,7 @@
  *  ASORT_PREFIX(x) [*]	add a name prefix (used on all global names
  *			defined by the sorter)
  *  ASORT_KEY_TYPE  [*]	data type of a single array entry key
- *  ASORT_LT(x,y)	x < y for ASORT_TYPE (default: "x<y")
+ *  ASORT_LT(x,y)	x < y for ASORT_KEY_TYPE (default: "x<y")
  *  ASORT_HASH(x)	a monotone hash function (safisfying hash(x) < hash(y) => x<y)
  *  ASORT_LONG_HASH	hashes are 64-bit numbers (default is 32 bits)
  *
@@ -62,7 +62,7 @@ typedef ASORT_KEY_TYPE Q(key);
 #endif
 
 #ifndef ASORT_RADIX_BITS
-#define ASORT_RADIX_BITS 12		// FIXME: Tune automatically?
+#define ASORT_RADIX_BITS CONFIG_UCW_RADIX_SORTER_BITS
 #endif
 #define ASORT_RADIX_MASK ((1 << (ASORT_RADIX_BITS)) - 1)
 
@@ -287,7 +287,7 @@ static void Q(radix_split)(void *src_ptr, void *dest_ptr, uns num_elts, uns *ptr
 static Q(key) *Q(sort)(Q(key) *array, uns num_elts
 #ifdef ASORT_HASH
   , Q(key) *buffer, uns hash_bits
-#endif  
+#endif
   )
 {
   struct asort_context ctx = {
@@ -308,15 +308,14 @@ static Q(key) *Q(sort)(Q(key) *array, uns num_elts
   return ctx.array;
 }
 
-/* FIXME */
-#undef ASORT_PREFIX
+#undef ASORT_HASH
 #undef ASORT_KEY_TYPE
+#undef ASORT_LONG_HASH
 #undef ASORT_LT
-#undef ASORT_SWAP
-#undef ASORT_THRESHOLD
 #undef ASORT_PAGE_ALIGNED
-#undef ASORT_HASH
+#undef ASORT_PREFIX
 #undef ASORT_RADIX_BITS
 #undef ASORT_RADIX_MASK
-#undef ASORT_LONG_HASH
+#undef ASORT_SWAP
+#undef ASORT_THRESHOLD
 #undef Q