security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-06-12 18:11:03 +02:00
Code Activity

intl: Fix for uClibc.

Browse Source 
* intl/localename.c (gl_locale_name_thread_unsafe): Take care of
uCLIBC.
--

Patch provided by "vriera".

GnuPG-bug-id: 1642
This commit is contained in:
Werner Koch 2014-06-23 10:22:32 +02:00
parent 60bd6488c0
commit bb4d5c2d5f
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
intl/localename.c
View File

@ -2607,7 +2607,7 @@ gl_locale_name_thread_unsafe (int category, const char *categoryname)
locale_t thread_locale = uselocale (NULL); locale_t thread_locale = uselocale (NULL);
if (thread_locale != LC_GLOBAL_LOCALE) if (thread_locale != LC_GLOBAL_LOCALE)
{ {
# if __GLIBC__ >= 2 # if __GLIBC__ >= 2 && !defined(__UCLIBC__)
/* Work around an incorrect definition of the _NL_LOCALE_NAME macro in /* Work around an incorrect definition of the _NL_LOCALE_NAME macro in
glibc < 2.12. glibc < 2.12.
See <http://sourceware.org/bugzilla/show_bug.cgi?id=10968>. */ See <http://sourceware.org/bugzilla/show_bug.cgi?id=10968>. */
@ -2771,7 +2771,8 @@ gl_locale_name_thread (int category, const char *categoryname)
However it does not specify the exact format. Neither do SUSV2 and However it does not specify the exact format. Neither do SUSV2 and
ISO C 99. So we can use this feature only on selected systems (e.g. ISO C 99. So we can use this feature only on selected systems (e.g.
those using GNU C Library). */ those using GNU C Library). */
#if defined _LIBC || (defined __GLIBC__ && __GLIBC__ >= 2) #if defined _LIBC || (defined __GLIBC__ && __GLIBC__ >= 2 \
&& (!defined __UCLIBC__ || defined __UCLIBC_HAS_LOCALE__))
# define HAVE_LOCALE_NULL # define HAVE_LOCALE_NULL
#endif #endif