luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-04-01 21:33:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'xlocale-musl' into 'main'

Browse Source 
gstrfuncs: don't require nonstandard functions for USE_XLOCALE.

Closes #2553

See merge request GNOME/glib!2388
This commit is contained in:
Philip Withnall 2021-12-10 13:05:53 +00:00
commit 67dad10fb8
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
glib/gstrfuncs.c
View File

@ -317,11 +317,8 @@ static const guint16 ascii_table_data[256] = {
const guint16 * const g_ascii_table = ascii_table_data; const guint16 * const g_ascii_table = ascii_table_data;
#if defined (HAVE_NEWLOCALE) && \ #if defined(HAVE_NEWLOCALE) && \
defined (HAVE_USELOCALE) && \ defined(HAVE_USELOCALE)
defined (HAVE_STRTOD_L) && \
defined (HAVE_STRTOULL_L) && \
defined (HAVE_STRTOLL_L)
#define USE_XLOCALE 1 #define USE_XLOCALE 1
#endif #endif
@ -731,7 +728,7 @@ gdouble
g_ascii_strtod (const gchar *nptr, g_ascii_strtod (const gchar *nptr,
gchar **endptr) gchar **endptr)
{ {
#ifdef USE_XLOCALE #if defined(USE_XLOCALE) && defined(HAVE_STRTOD_L)
g_return_val_if_fail (nptr != NULL, 0); g_return_val_if_fail (nptr != NULL, 0);
@ -1044,7 +1041,7 @@ g_ascii_formatd (gchar *buffer,
#define TOUPPER(c) (ISLOWER (c) ? (c) - 'a' + 'A' : (c)) #define TOUPPER(c) (ISLOWER (c) ? (c) - 'a' + 'A' : (c))
#define TOLOWER(c) (ISUPPER (c) ? (c) - 'A' + 'a' : (c)) #define TOLOWER(c) (ISUPPER (c) ? (c) - 'A' + 'a' : (c))
#ifndef USE_XLOCALE #if !defined(USE_XLOCALE) || !defined(HAVE_STRTOULL_L) || !defined(HAVE_STRTOLL_L)
static guint64 static guint64
g_parse_long_long (const gchar *nptr, g_parse_long_long (const gchar *nptr,
@ -1169,7 +1166,7 @@ g_parse_long_long (const gchar *nptr,
} }
return 0; return 0;
} }
#endif /* !USE_XLOCALE */ #endif /* !defined(USE_XLOCALE) || !defined(HAVE_STRTOULL_L) || !defined(HAVE_STRTOLL_L) */
/** /**
* g_ascii_strtoull: * g_ascii_strtoull:
@ -1210,7 +1207,7 @@ g_ascii_strtoull (const gchar *nptr,
gchar **endptr, gchar **endptr,
guint base) guint base)
{ {
#ifdef USE_XLOCALE #if defined(USE_XLOCALE) && defined(HAVE_STRTOULL_L)
return strtoull_l (nptr, endptr, base, get_C_locale ()); return strtoull_l (nptr, endptr, base, get_C_locale ());
#else #else
gboolean negative; gboolean negative;
@ -1257,7 +1254,7 @@ g_ascii_strtoll (const gchar *nptr,
gchar **endptr, gchar **endptr,
guint base) guint base)
{ {
#ifdef USE_XLOCALE #if defined(USE_XLOCALE) && defined(HAVE_STRTOLL_L)
return strtoll_l (nptr, endptr, base, get_C_locale ()); return strtoll_l (nptr, endptr, base, get_C_locale ());
#else #else
gboolean negative; gboolean negative;