summaryrefslogtreecommitdiff
path: root/lib/duplocale.c
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2009-11-24 22:11:28 +0100
committerLudovic Courtès <ludo@gnu.org>2009-11-24 22:11:28 +0100
commitb3eba3b2ff92b0ea2b1150242ef85bc245a10d9c (patch)
tree73a0b010b7c4b137387c87779e3dcd4a6ea3d231 /lib/duplocale.c
parent6b1bc6e56aa6cece3acb4ec2be5324dc3be04a05 (diff)
downloadguile-b3eba3b2ff92b0ea2b1150242ef85bc245a10d9c.tar.gz
Update to Gnulib v0.0-2923-g6575ab5.
Diffstat (limited to 'lib/duplocale.c')
-rw-r--r--lib/duplocale.c19
1 files changed, 2 insertions, 17 deletions
diff --git a/lib/duplocale.c b/lib/duplocale.c
index e7618b800..1077abe2a 100644
--- a/lib/duplocale.c
+++ b/lib/duplocale.c
@@ -22,15 +22,8 @@
#include <locale.h>
#include <errno.h>
-#include <langinfo.h>
#include <string.h>
-/* Work around an incorrect definition of the _NL_LOCALE_NAME macro in
- glibc < 2.12.
- See <http://sourceware.org/bugzilla/show_bug.cgi?id=10968>. */
-#undef _NL_LOCALE_NAME
-#define _NL_LOCALE_NAME(category) _NL_ITEM ((category), _NL_ITEM_INDEX (-1))
-
#define SIZEOF(a) (sizeof(a) / sizeof(a[0]))
#undef duplocale
@@ -74,11 +67,7 @@ rpl_duplocale (locale_t locale)
locale_t base_copy;
unsigned int i;
- base_name = nl_langinfo (_NL_LOCALE_NAME (LC_CTYPE));
- if (base_name[0] == '\0')
- /* Fallback code for glibc < 2.4, which did not implement
- nl_langinfo (_NL_LOCALE_NAME (category)). */
- base_name = setlocale (LC_CTYPE, NULL);
+ base_name = setlocale (LC_CTYPE, NULL);
base_copy = newlocale (LC_ALL_MASK, base_name, NULL);
if (base_copy == NULL)
return NULL;
@@ -87,11 +76,7 @@ rpl_duplocale (locale_t locale)
{
int category = categories[i].cat;
int category_mask = categories[i].mask;
- const char *name = nl_langinfo (_NL_LOCALE_NAME (category));
- if (name[0] == '\0')
- /* Fallback code for glibc < 2.4, which did not implement
- nl_langinfo (_NL_LOCALE_NAME (category)). */
- name = setlocale (category, NULL);
+ const char *name = setlocale (category, NULL);
if (strcmp (name, base_name) != 0)
{
locale_t copy = newlocale (category_mask, name, base_copy);