Merge tag 'upstream/0.9.7'

Upstream version 0.9.7

1 files changed, 15 insertions, 13 deletions

diff --git a/lib/unistr/u16-mblen.c b/lib/unistr/u16-mblen.c
index 6fab7e8..5a1cfb2 100644
--- a/lib/unistr/u16-mblen.c
+++ b/lib/unistr/u16-mblen.c
@@ -1,13 +1,22 @@
 /* Look at first character in UTF-16 string.
-   Copyright (C) 1999-2000, 2002, 2006-2007, 2009-2015 Free Software
+   Copyright (C) 1999-2000, 2002, 2006-2007, 2009-2016 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
-   under the terms of the GNU Lesser General Public License as published
-   by the Free Software Foundation; either version 3 of the License, or
-   (at your option) any later version.
+   This program is free software: you can redistribute it and/or
+   modify it under the terms of either:
 
+     * the GNU Lesser General Public License as published by the Free
+       Software Foundation; either version 3 of the License, or (at your
+       option) any later version.
+
+   or
+
+     * the GNU General Public License as published by the Free
+       Software Foundation; either version 2 of the License, or (at your
+       option) any later version.
+
+   or both in parallel, as here.
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -26,24 +35,17 @@ u16_mblen (const uint16_t *s, size_t n)
 {
   if (n > 0)
     {
-      /* Keep in sync with unistr.h and utf16-ucs4.c.  */
+      /* Keep in sync with unistr.h and u16-mbtouc-aux.c.  */
       uint16_t c = *s;
 
       if (c < 0xd800 || c >= 0xe000)
         return (c != 0 ? 1 : 0);
-#if CONFIG_UNICODE_SAFETY
       if (c < 0xdc00)
         {
           if (n >= 2
               && s[1] >= 0xdc00 && s[1] < 0xe000)
             return 2;
         }
-#else
-        {
-          if (n >= 2)
-            return 2;
-        }
-#endif
     }
   /* invalid or incomplete multibyte character */
   return -1;