Merge tag 'upstream/0.9.7'

Upstream version 0.9.7

1 files changed, 14 insertions, 9 deletions

diff --git a/lib/unistr/u16-prev.c b/lib/unistr/u16-prev.c
index e1a68549..dc995c67 100644
--- a/lib/unistr/u16-prev.c
+++ b/lib/unistr/u16-prev.c
@@ -1,12 +1,21 @@
 /* Iterate over previous character in UTF-16 string.
-   Copyright (C) 2002, 2006-2007, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 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
@@ -33,16 +42,12 @@ u16_prev (ucs4_t *puc, const uint16_t *s, const uint16_t *start)
           *puc = c_1;
           return s - 1;
         }
-#if CONFIG_UNICODE_SAFETY
       if (c_1 >= 0xdc00)
-#endif
         if (s - 1 != start)
           {
             uint16_t c_2 = s[-2];
 
-#if CONFIG_UNICODE_SAFETY
             if (c_2 >= 0xd800 && c_2 < 0xdc00)
-#endif
               {
                 *puc = 0x10000 + ((c_2 - 0xd800) << 10) + (c_1 - 0xdc00);
                 return s - 2;