Update after gnulib changed.

* gettext-runtime/intl/setlocale.c: Include setlocale-fixes.h instead of
setlocale-messages.h.
(setlocale_unixlike) [__ANDROID__]: Use setlocale_fixed instead of setlocale.
(setlocale_improved): On Android, use setlocale_fixed_null instead of setlocale.

diff --git a/gettext-runtime/intl/setlocale.c b/gettext-runtime/intl/setlocale.c
index 51c527c89528d191ef7a36db2502d1267ef94d78..86c4741efdb46a86c6f5d8210bb9e7e97eb7b615 100644 (file)
--- a/gettext-runtime/intl/setlocale.c
+++ b/gettext-runtime/intl/setlocale.c
@@ -57,7 +57,7 @@
 # define SHLIB_EXPORTED
 #endif
 
-#include "setlocale-messages.h"
+#include "setlocale-fixes.h"
 #include "localename.h"
 
 #if HAVE_CFLOCALECOPYPREFERREDLANGUAGES || HAVE_CFPREFERENCESCOPYAPPVALUE
@@ -870,7 +870,7 @@ setlocale_unixlike (int category, const char *locale)
 static char *
 setlocale_unixlike (int category, const char *locale)
 {
-  char *result = setlocale (category, locale);
+  char *result = setlocale_fixed (category, locale);
   if (result == NULL)
     switch (category)
       {
@@ -1814,6 +1814,8 @@ libintl_setlocale (int category, const char *locale)
         return resultbuf;
       }
   }
+# elif defined __ANDROID__
+  return setlocale_fixed_null (LC_ALL);
 # else
   return setlocale (LC_ALL, NULL);
 # endif