mirror/gettext
1
0
Fork 0
mirror of https://https.git.savannah.gnu.org/git/gettext.git synced 2026-01-26 15:39:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update after gnulib changed.

Browse Source 
* 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.
This commit is contained in:
Bruno Haible 2025-03-22 13:20:36 +01:00
parent a3af27ae1a
commit 8a037738f9
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gettext-runtime/intl/setlocale.c
View File

@ -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