Squash a couple of warnings.

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

diff --git a/lib/sorter/s-internal.h b/lib/sorter/s-internal.h
index 7fd84bc83f54cb92f13ce59385980bae165489cd..309c503b1eec43781641ee7be0d2ddc03f42e554 100644 (file)
--- a/lib/sorter/s-internal.h
+++ b/lib/sorter/s-internal.h
@@ -56,7 +56,9 @@ static int P(internal)(struct sort_context *ctx, struct sort_bucket *bin, struct
 #endif
 
   size_t bufsize = ctx->big_buf_half_size;     /* FIXME: In some cases, we can use the whole buffer */
 #endif
 
   size_t bufsize = ctx->big_buf_half_size;     /* FIXME: In some cases, we can use the whole buffer */

+#ifdef CPU_64BIT_POINTERS

   bufsize = MIN((u64)bufsize, (u64)~0U * sizeof(P(internal_item_t)));  // The number of records must fit in uns
   bufsize = MIN((u64)bufsize, (u64)~0U * sizeof(P(internal_item_t)));  // The number of records must fit in uns

+#endif

 
   SORT_XTRACE("s-internal: Reading (bufsize=%zd)", bufsize);
   P(internal_item_t) *item_array = ctx->big_buf, *item = item_array, *last_item;
 
   SORT_XTRACE("s-internal: Reading (bufsize=%zd)", bufsize);
   P(internal_item_t) *item_array = ctx->big_buf, *item = item_array, *last_item;


@@ -97,7 +99,7 @@ static int P(internal)(struct sort_context *ctx, struct sort_bucket *bin, struct
     bout = bout_only;
   struct fastbuf *out = sbuck_write(bout);
   bout->runs++;
     bout = bout_only;
   struct fastbuf *out = sbuck_write(bout);
   bout->runs++;

-  uns merged = 0;
+  uns merged UNUSED = 0;

   for (item = item_array; item < last_item; item++)
     {
 #ifdef SORT_UNIFY
   for (item = item_array; item < last_item; item++)
     {
 #ifdef SORT_UNIFY