Merge branch 'feature/upstream' into develop

1 files changed, 25 insertions, 25 deletions

diff --git a/lib/uniwbrk.in.h b/lib/uniwbrk.in.h
index 99ca49e2..302fbec8 100644
--- a/lib/uniwbrk.in.h
+++ b/lib/uniwbrk.in.h
@@ -1,28 +1,27 @@
 /* Word breaks in Unicode strings.
-   Copyright (C) 2001-2003, 2005-2018 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003, 2005-2022 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2009.
 
-   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,
+   This file is free software.
+   It is dual-licensed under "the GNU LGPLv3+ or the GNU GPLv2+".
+   You can redistribute it and/or modify it under either
+     - the terms of the GNU Lesser General Public License as published
+       by the Free Software Foundation; either version 3, or (at your
+       option) any later version, or
+     - the terms of the GNU General Public License as published by the
+       Free Software Foundation; either version 2, or (at your option)
+       any later version, or
+     - the same dual license "the GNU LGPLv3+ or the GNU GPLv2+".
+
+   This file 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
-   Lesser General Public License for more details.
+   Lesser General Public License and the GNU General Public License
+   for more details.
 
-   You should have received a copy of the GNU Lesser General Public License
-   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
+   You should have received a copy of the GNU Lesser General Public
+   License and of the GNU General Public License along with this
+   program.  If not, see <https://www.gnu.org/licenses/>.  */
 
 #ifndef _UNIWBRK_H
 #define _UNIWBRK_H
@@ -40,7 +39,7 @@ extern "C" {
 /* ========================================================================= */
 
 /* Property defined in Unicode Standard Annex #29, section "Word Boundaries"
-   <http://www.unicode.org/reports/tr29/#Word_Boundaries>  */
+   <https://www.unicode.org/reports/tr29/#Word_Boundaries>  */
 
 /* Possible values of the Word_Break property.
    This enumeration may be extended in the future.  */
@@ -64,10 +63,11 @@ enum
   WBP_SQ           = 15,
   WBP_HL           = 16,
   WBP_ZWJ          = 17,
-  WBP_EB           = 18,
-  WBP_EM           = 19,
-  WBP_GAZ          = 20,
-  WBP_EBG          = 21
+  WBP_EB           = 18, /* obsolete */
+  WBP_EM           = 19, /* obsolete */
+  WBP_GAZ          = 20, /* obsolete */
+  WBP_EBG          = 21, /* obsolete */
+  WBP_WSS          = 22
 };
 
 /* Return the Word_Break property of a Unicode character.  */
@@ -90,7 +90,7 @@ extern void
 extern void
        u32_wordbreaks (const uint32_t *s, size_t n, char *p);
 extern void
-       ulc_wordbreaks (const char *s, size_t n, char *p);
+       ulc_wordbreaks (const char *s, size_t n, char *_UC_RESTRICT p);
 
 /* ========================================================================= */