Update after gnulib changed.

* gettext-runtime/intl/setlocale.c: Include setlocale-messages.h.
(lc_messages_name): Remove variable.

diff --git a/gettext-runtime/intl/setlocale.c b/gettext-runtime/intl/setlocale.c
index 726bde840eb2e30361cc7b78601b5ede375169ac..51c527c89528d191ef7a36db2502d1267ef94d78 100644 (file)
--- a/gettext-runtime/intl/setlocale.c
+++ b/gettext-runtime/intl/setlocale.c
@@ -57,6 +57,7 @@
 # define SHLIB_EXPORTED
 #endif
 
+#include "setlocale-messages.h"
 #include "localename.h"
 
 #if HAVE_CFLOCALECOPYPREFERREDLANGUAGES || HAVE_CFPREFERENCESCOPYAPPVALUE
@@ -902,22 +903,12 @@ setlocale_unixlike (int category, const char *locale)
 
 # if LC_MESSAGES == 1729
 
-/* The system does not store an LC_MESSAGES locale category.  Do it here.  */
-static char lc_messages_name[64] = "C";
-
 /* Like setlocale, but support also LC_MESSAGES.  */
 static char *
 setlocale_single (int category, const char *locale)
 {
   if (category == LC_MESSAGES)
-    {
-      if (locale != NULL)
-        {
-          lc_messages_name[sizeof (lc_messages_name) - 1] = '\0';
-          strncpy (lc_messages_name, locale, sizeof (lc_messages_name) - 1);
-        }
-      return lc_messages_name;
-    }
+    return setlocale_messages (locale);
   else
     return setlocale_unixlike (category, locale);
 }