Update from Gnulib by running admin/merge-gnulib

(cherry picked from commit bd0e281a6a27c048b12847811bc0385acbaa1eec)

diff --git a/lib/gnulib.mk.in b/lib/gnulib.mk.in
index 9970f7810e2c75fe95c6113972c83c09cf82064a..711ddcf126081348c3123826d59959a8fa309e25 100644 (file)
--- a/lib/gnulib.mk.in
+++ b/lib/gnulib.mk.in
@@ -47,7 +47,7 @@
 #  --avoid=iswdigit \
 #  --avoid=iswxdigit \
 #  --avoid=langinfo \
-#  --avoid=localename \
+#  --avoid=localename-unsafe-limited \
 #  --avoid=lock \
 #  --avoid=mbrtowc \
 #  --avoid=mbsinit \

diff --git a/lib/strftime.c b/lib/strftime.c
index c7256c3d354c6895bf5ee499bc1c4905788a98c7..128176cad40c9b93b4d7193ffcc21295d9616cd6 100644 (file)
--- a/lib/strftime.c
+++ b/lib/strftime.c
@@ -401,7 +401,7 @@ should_remove_ampm (void)
      lt lv mg mhr mi mk mn ms mt nb nds nhn nl nn nr nso oc os pap pl pt ro
      ru rw sah sc se sgs sk sl sm sr ss st su sv szl tg tk tn ts tt ug uk unm
      uz ve wae wo xh zu  */
-  const char *loc = gl_locale_name (LC_TIME, "LC_TIME");
+  const char *loc = gl_locale_name_unsafe (LC_TIME, "LC_TIME");
   bool remove_ampm = false;
   switch (loc[0])
     {