summaryrefslogtreecommitdiff
path: root/locale/setlocale.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2000-01-05 07:47:25 +0000
committerUlrich Drepper <drepper@redhat.com>2000-01-05 07:47:25 +0000
commit72c743750c2a76df3611aa9a77ba72edefa2fb88 (patch)
tree7c3d82137a6a8ef9a830341c8fff007133fa9bd0 /locale/setlocale.c
parentf4aa71f4250923db875eb7df2d990020e1f5e2a3 (diff)
Update.
* locale/programs/stringtrans.c: Removed. * locale/programs/stringtrans.h: Removed. * locale/findlocale.c (_nl_find_locale): Don't try using mmap is _POSIX_MAPPED_FILES is not defined. * locale/findlocale.c (_nl_find_locale): Correct memory allocation for loc_name copy. * locale/setlocale.c (new_composite_name): Use _nl_C_name and _nl_POSIX_name instead of "C" and "POSIX" strings.
Diffstat (limited to 'locale/setlocale.c')
-rw-r--r--locale/setlocale.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/locale/setlocale.c b/locale/setlocale.c
index 1fdc94ff5b..0bf9eeef7b 100644
--- a/locale/setlocale.c
+++ b/locale/setlocale.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 92, 95, 96, 97, 98, 99 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 92, 95-99, 2000 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -154,8 +154,8 @@ new_composite_name (int category, const char *newnames[__LC_LAST])
if (same)
{
/* All the categories use the same name. */
- if (strcmp (newnames[0], "C") == 0
- || strcmp (newnames[0], "POSIX") == 0)
+ if (strcmp (newnames[0], _nl_C_name) == 0
+ || strcmp (newnames[0], _nl_POSIX_name) == 0)
return (char *) _nl_C_name;
new = malloc (last_len + 1);