X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Funicase%2Fu-casecmp.h;h=e1cf99c4676cdec9b5cc78ea4b64033aafdaa88d;hb=8def010e77c2bace5391a1cda45e158d9e0a3f7d;hp=50325b095c7235ec795de51bf751907cae08390a;hpb=a804c94d45f35507c1d7e2c34cdf53ec814eaede;p=gnulib.git

diff --git a/lib/unicase/u-casecmp.h b/lib/unicase/u-casecmp.h
index 50325b095..e1cf99c46 100644
--- a/lib/unicase/u-casecmp.h
+++ b/lib/unicase/u-casecmp.h
@@ -16,7 +16,7 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 int
-FUNC (const UNIT *s1, size_t n1, const UNIT *s2, size_t n2,
+FUNC (const SRC_UNIT *s1, size_t n1, const SRC_UNIT *s2, size_t n2,
       const char *iso639_language, uninorm_t nf, int *resultp)
 {
   UNIT buf1[2048 / sizeof (UNIT)];
@@ -54,15 +54,8 @@ FUNC (const UNIT *s1, size_t n1, const UNIT *s2, size_t n2,
     }
 
   /* Compare the normalized strings.  */
-  cmp = U_CMP (norms1, norms2, MIN (norms1_length, norms2_length));
-  if (cmp == 0)
-    {
-      if (norms1_length < norms2_length)
-	cmp = -1;
-      else if (norms1_length > norms2_length)
-	cmp = 1;
-    }
-  else if (cmp > 0)
+  cmp = U_CMP2 (norms1, norms1_length, norms2, norms2_length);
+  if (cmp > 0)
     cmp = 1;
   else if (cmp < 0)
     cmp = -1;