aboutsummaryrefslogtreecommitdiff
path: root/gnulib/import/lc-charset-dispatch.c
diff options
context:
space:
mode:
authorTom Tromey <tromey@adacore.com>2022-04-18 09:44:18 -0600
committerTom Tromey <tromey@adacore.com>2022-04-18 10:14:04 -0600
commitdc6c21dabfbd242616b9e6266b459eded2d0762b (patch)
treeb2fbadbdbcd20dfa3f9dfe179db1c348e2aa5901 /gnulib/import/lc-charset-dispatch.c
parent2390419d1cb72882110538e01e5586372df19657 (diff)
downloadgdb-dc6c21dabfbd242616b9e6266b459eded2d0762b.zip
gdb-dc6c21dabfbd242616b9e6266b459eded2d0762b.tar.gz
gdb-dc6c21dabfbd242616b9e6266b459eded2d0762b.tar.bz2
Update gnulib
This updates gnulib to a relatively recent commit. Most of this was done by the gnulib import script; the only change I made was to update-gnulib.sh. Tested on x86-64 Fedora 34. I also did a mingw cross build.
Diffstat (limited to 'gnulib/import/lc-charset-dispatch.c')
-rw-r--r--gnulib/import/lc-charset-dispatch.c22
1 files changed, 11 insertions, 11 deletions
diff --git a/gnulib/import/lc-charset-dispatch.c b/gnulib/import/lc-charset-dispatch.c
index 879f71a..66d78fd 100644
--- a/gnulib/import/lc-charset-dispatch.c
+++ b/gnulib/import/lc-charset-dispatch.c
@@ -1,17 +1,17 @@
/* Dispatching based on the current locale's character encoding.
- Copyright (C) 2018-2021 Free Software Foundation, Inc.
+ Copyright (C) 2018-2022 Free Software Foundation, Inc.
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 3 of the License, or
- (at your option) any later version.
+ 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.
- 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
+ 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/>. */
/* Written by Bruno Haible <bruno@clisp.org>, 2018. */
@@ -26,7 +26,7 @@
# include "localcharset.h"
# include "streq.h"
-# if GNULIB_WCHAR_SINGLE
+# if GNULIB_WCHAR_SINGLE_LOCALE
/* When we know that the locale does not change, provide a speedup by
caching the value of locale_encoding_classification. */
# define locale_encoding_classification_cached locale_encoding_classification
@@ -35,7 +35,7 @@
# define locale_encoding_classification_uncached locale_encoding_classification
# endif
-# if GNULIB_WCHAR_SINGLE
+# if GNULIB_WCHAR_SINGLE_LOCALE
static inline
# endif
enc_t
@@ -59,7 +59,7 @@ locale_encoding_classification_uncached (void)
return enc_other;
}
-# if GNULIB_WCHAR_SINGLE
+# if GNULIB_WCHAR_SINGLE_LOCALE
static int cached_locale_enc = -1;