X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=lib%2Farraysort.h;h=d5a9c787d3279643f7df1c5edfb3a52f95fee29a;hb=ebc61451614fb62a13e55c3974f538a06b7463a8;hp=3f9d2a18529a8fd25cbc3c33261a3f7e6c031766;hpb=c00768164382b6a53a7090b6d015c7a8989141f1;p=libucw.git

diff --git a/lib/arraysort.h b/lib/arraysort.h
index 3f9d2a18..d5a9c787 100644
--- a/lib/arraysort.h
+++ b/lib/arraysort.h
@@ -1,5 +1,5 @@
 /*
- *	Sherlock Library -- Universal Array Sorter
+ *	UCW Library -- Universal Array Sorter
  *
  *	(c) 2003 Martin Mares <mj@ucw.cz>
  *
@@ -100,7 +100,7 @@ static void ASORT_PREFIX(sort)(uns array_size ASORT_EXTRA_ARGS)
 	    }
 	}
       while (l <= r);
-      if ((r - left) > ASORT_THRESHOLD && (right - l) > ASORT_THRESHOLD)
+      if ((r - left) >= ASORT_THRESHOLD && (right - l) >= ASORT_THRESHOLD)
 	{
 	  /* Both partitions ok => push the larger one */
 	  if ((r - left) > (right - l))
@@ -117,12 +117,12 @@ static void ASORT_PREFIX(sort)(uns array_size ASORT_EXTRA_ARGS)
 	    }
 	  sp++;
 	}
-      else if ((r - left) > ASORT_THRESHOLD)
+      else if ((r - left) >= ASORT_THRESHOLD)
 	{
 	  /* Left partition OK, right undersize */
 	  right = r;
 	}
-      else if ((right - l) > ASORT_THRESHOLD)
+      else if ((right - l) >= ASORT_THRESHOLD)
 	{
 	  /* Right partition OK, left undersize */
 	  left = l;
@@ -166,9 +166,9 @@ static void ASORT_PREFIX(sort)(uns array_size ASORT_EXTRA_ARGS)
 }
 
 #undef ASORT_PREFIX
-#undef ASORT_TYPE
+#undef ASORT_KEY_TYPE
 #undef ASORT_ELT
-#undef ASORT_EQ
+#undef ASORT_LT
 #undef ASORT_SWAP
 #undef ASORT_THRESHOLD
 #undef ASORT_EXTRA_ARGS