diff options
| author | Jörg Frings-Fürst <debian@jff.email> | 2022-02-07 06:57:44 +0100 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff.email> | 2022-02-07 06:57:44 +0100 |
| commit | 6ffaa52cf732a84c0f8259dbc9b8183960ec5c33 (patch) | |
| tree | d3136c22e3e805cfc0efe78412cce905a17e0c8d /lib/iconv.c | |
| parent | 591cbf5878b7d4105b275585b9db1324c9dfce56 (diff) | |
| parent | af151c593704a40e10efb28d1e3dd59a23a661f3 (diff) | |
Merge branch 'release/debian/1.0-1'debian/1.0-1
Diffstat (limited to 'lib/iconv.c')
| -rw-r--r-- | lib/iconv.c | 30 |
1 files changed, 9 insertions, 21 deletions
diff --git a/lib/iconv.c b/lib/iconv.c index abb5ec3..efab53d 100644 --- a/lib/iconv.c +++ b/lib/iconv.c @@ -1,27 +1,18 @@ /* Character set conversion. - Copyright (C) 1999-2001, 2007, 2009-2018 Free Software Foundation, Inc. + Copyright (C) 1999-2001, 2007, 2009-2022 Free Software Foundation, Inc. - This program is free software: you can redistribute it and/or - modify it under the terms of either: + This file 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 2.1 of the + License, or (at your option) any later version. - * 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 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 General Public License for more details. + GNU Lesser General Public License for more details. - You should have received a copy of the GNU 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 + along with this program. If not, see <https://www.gnu.org/licenses/>. */ #include <config.h> @@ -35,9 +26,6 @@ # include <stdint.h> # include <stdlib.h> # include "unistr.h" -# ifndef uintptr_t -# define uintptr_t unsigned long -# endif #endif #if REPLACE_ICONV_UTF |