X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=lib%2Fsorter%2Fs-fixint.h;h=9787a682010b1a8c88659acd4eb4543a6daca8bc;hb=7cf300f543b5023ad46a909ed6fde0feba5d1acd;hp=e2a24b5b2e39065533470039afc232990e79d90a;hpb=ed088bedabfba6dc0e1f48f3ba750407cf96a1b3;p=libucw.git diff --git a/lib/sorter/s-fixint.h b/lib/sorter/s-fixint.h index e2a24b5b..9787a682 100644 --- a/lib/sorter/s-fixint.h +++ b/lib/sorter/s-fixint.h @@ -12,7 +12,6 @@ #define ASORT_PREFIX(x) SORT_PREFIX(array_##x) #define ASORT_KEY_TYPE P(key) #define ASORT_LT(x,y) (P(compare)(&(x), &(y)) < 0) -#define ASORT_PAGE_ALIGNED #ifdef SORT_INTERNAL_RADIX # define ASORT_HASH(x) P(hash)(&(x)) # ifdef SORT_LONG_HASH @@ -73,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); - buf = P(array_sort)(buf, n, + buf = P(array_sort)(buf, n #ifdef SORT_INTERNAL_RADIX - workspace, bin->hash_bits -#else - NULL, 0 + , workspace, bin->hash_bits #endif ); ctx->total_int_time += get_timer(&timer);