summaryrefslogtreecommitdiff
path: root/lib/unistring/inline.h
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff.email>2022-02-07 06:57:44 +0100
committerJörg Frings-Fürst <debian@jff.email>2022-02-07 06:57:44 +0100
commit6ffaa52cf732a84c0f8259dbc9b8183960ec5c33 (patch)
treed3136c22e3e805cfc0efe78412cce905a17e0c8d /lib/unistring/inline.h
parent591cbf5878b7d4105b275585b9db1324c9dfce56 (diff)
parentaf151c593704a40e10efb28d1e3dd59a23a661f3 (diff)
Merge branch 'release/debian/1.0-1'debian/1.0-1
Diffstat (limited to 'lib/unistring/inline.h')
-rw-r--r--lib/unistring/inline.h27
1 files changed, 18 insertions, 9 deletions
diff --git a/lib/unistring/inline.h b/lib/unistring/inline.h
index bdb0b22..4605fbf 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.