Update from gnulib.
diff --git a/libcharset/lib/ChangeLog b/libcharset/lib/ChangeLog
index 5d57f1d..bab618e 100644
--- a/libcharset/lib/ChangeLog
+++ b/libcharset/lib/ChangeLog
@@ -1,3 +1,10 @@
+2019-12-24 Bruno Haible <bruno@clisp.org>
+
+ Update from gnulib.
+ 2019-12-24 Bruno Haible <bruno@clisp.org>
+ localcharset: Avoid referencing rpl_setlocale on native Windows.
+ * localcharset.c (setlocale): Undefine.
+
2019-12-22 Bruno Haible <bruno@clisp.org>
Update from gnulib.
diff --git a/libcharset/lib/localcharset.c b/libcharset/lib/localcharset.c
index fdef2a3..ebfdf7c 100644
--- a/libcharset/lib/localcharset.c
+++ b/libcharset/lib/localcharset.c
@@ -58,6 +58,9 @@
#elif defined WINDOWS_NATIVE
# define WIN32_LEAN_AND_MEAN
# include <windows.h>
+ /* For the use of setlocale() below, the Gnulib override in setlocale.c is
+ not needed; see the platform lists in setlocale_null.m4. */
+# undef setlocale
#endif
#if defined OS2
# define INCL_DOS
