diff options
Diffstat (limited to 'lib/unistr/u32-strmbtouc.c')
| -rw-r--r-- | lib/unistr/u32-strmbtouc.c | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/lib/unistr/u32-strmbtouc.c b/lib/unistr/u32-strmbtouc.c index cfa89d02..dabe648f 100644 --- a/lib/unistr/u32-strmbtouc.c +++ b/lib/unistr/u32-strmbtouc.c @@ -1,12 +1,21 @@ /* Look at first character in UTF-32 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 @@ -25,15 +34,11 @@ u32_strmbtouc (ucs4_t *puc, const uint32_t *s) { uint32_t c = *s; -#if CONFIG_UNICODE_SAFETY if (c < 0xd800 || (c >= 0xe000 && c < 0x110000)) -#endif { *puc = c; return (c != 0 ? 1 : 0); } -#if CONFIG_UNICODE_SAFETY /* invalid multibyte character */ return -1; -#endif } |