New upstream version 1.0upstream/1.0

5 files changed, 166 insertions, 45 deletions

diff --git a/lib/unistring/cdefs.h b/lib/unistring/cdefs.h
new file mode 100644
index 00000000..3faf5ba8
--- /dev/null
+++ b/lib/unistring/cdefs.h
@@ -0,0 +1,116 @@
+/* Common macro definitions for C include files.
+   Copyright (C) 2008-2021 Free Software Foundation, Inc.
+
+   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 Lesser 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/>.  */
+
+#ifndef _UNISTRING_CDEFS_H
+#define _UNISTRING_CDEFS_H
+
+/* _GL_UNUSED_PARAMETER is a marker that can be prepended to function parameter
+   declarations for parameters that are not used.  This helps to reduce
+   warnings, such as from GCC -Wunused-parameter.  The syntax is as follows:
+       _GL_UNUSED_PARAMETER type param
+   or more generally
+       _GL_UNUSED_PARAMETER param_decl
+   For example:
+       _GL_UNUSED_PARAMETER int param
+       _GL_UNUSED_PARAMETER int *(*param) (void)
+ */
+#ifndef _GL_UNUSED_PARAMETER
+# define _GL_UNUSED_PARAMETER _UC_ATTRIBUTE_MAYBE_UNUSED
+#endif
+/* _GL_ATTRIBUTE_MAYBE_UNUSED likewise.  */
+#ifndef _GL_ATTRIBUTE_MAYBE_UNUSED
+# define _GL_ATTRIBUTE_MAYBE_UNUSED _UC_ATTRIBUTE_MAYBE_UNUSED
+#endif
+
+#ifndef _GL_ATTRIBUTE_MALLOC
+# define _GL_ATTRIBUTE_MALLOC _UC_ATTRIBUTE_MALLOC
+#endif
+
+/* _GL_ATTRIBUTE_DEALLOC (F, I) is for functions returning pointers
+   that can be freed by passing them as the Ith argument to the
+   function F.  _UC_ATTRIBUTE_DEALLOC_FREE is for functions that
+   return pointers that can be freed via 'free'; it can be used
+   only after including stdlib.h.  These macros cannot be used on
+   inline functions.  */
+#ifndef _GL_ATTRIBUTE_DEALLOC
+# define _GL_ATTRIBUTE_DEALLOC _UC_ATTRIBUTE_DEALLOC
+#endif
+#ifndef _GL_ATTRIBUTE_DEALLOC_FREE
+# define _GL_ATTRIBUTE_DEALLOC_FREE _UC_ATTRIBUTE_DEALLOC_FREE
+#endif
+
+/* The definitions below are taken from gnulib/m4/gnulib-common.m4,
+   with prefix _UC instead of prefix _GL.  */
+
+/* True if the compiler says it groks GNU C version MAJOR.MINOR.  */
+#if defined __GNUC__ && defined __GNUC_MINOR__
+# define _UC_GNUC_PREREQ(major, minor) \
+    ((major) < __GNUC__ + ((minor) <= __GNUC_MINOR__))
+#else
+# define _UC_GNUC_PREREQ(major, minor) 0
+#endif
+
+#if (defined __has_attribute \
+     && (!defined __clang_minor__ \
+         || 3 < __clang_major__ + (5 <= __clang_minor__)))
+# define _UC_HAS_ATTRIBUTE(attr) __has_attribute (__##attr##__)
+#else
+# define _UC_HAS_ATTRIBUTE(attr) _UC_ATTR_##attr
+# define _UC_ATTR_malloc _UC_GNUC_PREREQ (3, 0)
+# define _UC_ATTR_unused _UC_GNUC_PREREQ (2, 7)
+#endif
+
+#ifdef __has_c_attribute
+# define _UC_HAS_C_ATTRIBUTE(attr) __has_c_attribute (__##attr##__)
+#else
+# define _UC_HAS_C_ATTRIBUTE(attr) 0
+#endif
+
+#if _UC_GNUC_PREREQ (11, 0)
+# define _UC_ATTRIBUTE_DEALLOC(f, i) __attribute__ ((__malloc__ (f, i)))
+#else
+# define _UC_ATTRIBUTE_DEALLOC(f, i)
+#endif
+#define _UC_ATTRIBUTE_DEALLOC_FREE _UC_ATTRIBUTE_DEALLOC (free, 1)
+
+#if _UC_HAS_ATTRIBUTE (malloc)
+# define _UC_ATTRIBUTE_MALLOC __attribute__ ((__malloc__))
+#else
+# define _UC_ATTRIBUTE_MALLOC
+#endif
+
+#if _UC_HAS_C_ATTRIBUTE (maybe_unused)
+# define _UC_ATTRIBUTE_MAYBE_UNUSED [[__maybe_unused__]]
+#else
+# define _UC_ATTRIBUTE_MAYBE_UNUSED _UC_ATTRIBUTE_UNUSED
+#endif
+
+#if _UC_HAS_ATTRIBUTE (unused)
+# define _UC_ATTRIBUTE_UNUSED __attribute__ ((__unused__))
+#else
+# define _UC_ATTRIBUTE_UNUSED
+#endif
+
+#endif /* _UNISTRING_CDEFS_H */
diff --git a/lib/unistring/cdefs.in.h b/lib/unistring/cdefs.in.h
deleted file mode 100644
index 2be62c27..00000000
--- a/lib/unistring/cdefs.in.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* Common macro definitions for C include files.
-   Copyright (C) 2009 Free Software Foundation, Inc.
-
-   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 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.
-
-   You should have received a copy of the GNU Lesser General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
-
-#ifndef _UNISTRING_CDEFS_H
-#define _UNISTRING_CDEFS_H
-
-/* The definition of _GL_UNUSED_PARAMETER is copied here.  */
-
-#endif /* _UNISTRING_CDEFS_H */
diff --git a/lib/unistring/inline.h b/lib/unistring/inline.h
index bdb0b229..4605fbfa 100644
--- a/lib/unistring/inline.h
+++ b/lib/unistring/inline.h
@@ -1,18 +1,27 @@
 /* Decision whether to use 'inline' or not.
-   Copyright (C) 2006, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2009, 2018 Free Software Foundation, Inc.
 
-   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
-   Lesser General Public License for more details.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU Lesser 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 <http://www.gnu.org/licenses/>.  */
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
 /* Written by Bruno Haible <bruno@clisp.org>, 2009.  */
 
@@ -22,7 +31,7 @@
 /* This is like the gl_INLINE macro in gnulib/m4/inline.m4, but makes its
    decision based on defined preprocessor symbols rather than through
    autoconf tests.
-   See <http://lists.gnu.org/archive/html/bug-gnulib/2006-11/msg00055.html>  */
+   See <https://lists.gnu.org/archive/html/bug-gnulib/2006-11/msg00055.html>  */
 
 /* Test for the 'inline' keyword or equivalent.  ISO C 99 semantics is not
    required, only that 'static inline' works.
diff --git a/lib/unistring/version.in.h b/lib/unistring/version.in.h
index 7b572fd6..d35adc6b 100644
--- a/lib/unistring/version.in.h
+++ b/lib/unistring/version.in.h
@@ -2,18 +2,27 @@
    Copyright (C) 2009-2010 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 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
-   Lesser General Public License for more details.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU Lesser 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 <http://www.gnu.org/licenses/>.  */
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
 #ifndef _UNISTRING_VERSION_H
 #define _UNISTRING_VERSION_H
diff --git a/lib/unistring/woe32dll.in.h b/lib/unistring/woe32dll.in.h
index 7764c86e..6f5b9d85 100644
--- a/lib/unistring/woe32dll.in.h
+++ b/lib/unistring/woe32dll.in.h
@@ -1,18 +1,27 @@
 /* Support for variables in shared libraries on Windows platforms.
    Copyright (C) 2009 Free Software Foundation, Inc.
 
-   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
-   Lesser General Public License for more details.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU Lesser 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 <http://www.gnu.org/licenses/>.  */
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
 /* Written by Bruno Haible <bruno@clisp.org>, 2009.  */