Merge commit 'upstream/0.9.3'

1 files changed, 15 insertions, 15 deletions

diff --git a/lib/unistr/u16-cmp.c b/lib/unistr/u16-cmp.c
index 0130d271..b71c1c34 100644
--- a/lib/unistr/u16-cmp.c
+++ b/lib/unistr/u16-cmp.c
@@ -1,5 +1,5 @@
 /* Compare pieces of UTF-16 strings.
-   Copyright (C) 1999, 2002, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2002, 2006, 2009-2010 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2002.
 
    This program is free software: you can redistribute it and/or modify it
@@ -31,22 +31,22 @@ u16_cmp (const uint16_t *s1, const uint16_t *s2, size_t n)
       uint16_t c1 = *s1++;
       uint16_t c2 = *s2++;
       if (c1 == c2)
-	{
-	  n--;
-	  continue;
-	}
+        {
+          n--;
+          continue;
+        }
       if (c1 < 0xd800 || c1 >= 0xe000)
-	{
-	  if (!(c2 < 0xd800 || c2 >= 0xe000))
-	    /* c2 is a surrogate, but c1 is not.  */
-	    return -1;
-	}
+        {
+          if (!(c2 < 0xd800 || c2 >= 0xe000))
+            /* c2 is a surrogate, but c1 is not.  */
+            return -1;
+        }
       else
-	{
-	  if (c2 < 0xd800 || c2 >= 0xe000)
-	    /* c1 is a surrogate, but c2 is not.  */
-	    return 1;
-	}
+        {
+          if (c2 < 0xd800 || c2 >= 0xe000)
+            /* c1 is a surrogate, but c2 is not.  */
+            return 1;
+        }
       return (int)c1 - (int)c2;
       /* > 0 if c1 > c2, < 0 if c1 < c2. */
     }