aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2000-12-02 23:09:01 +0000
committerUlrich Drepper <drepper@redhat.com>2000-12-02 23:09:01 +0000
commit06f55c0c1d28a6ef1462c54a94988112070a0c50 (patch)
tree485caa0a48ee6546fa98be3f2d9413d89e4c3bba
parent00f5fcbb6cba4496fc9a80e90114762218bc7e1b (diff)
downloadglibc-06f55c0c1d28a6ef1462c54a94988112070a0c50.tar
glibc-06f55c0c1d28a6ef1462c54a94988112070a0c50.tar.gz
glibc-06f55c0c1d28a6ef1462c54a94988112070a0c50.tar.bz2
glibc-06f55c0c1d28a6ef1462c54a94988112070a0c50.zip
Update.
2000-12-02 H.J. Lu <hjl@gnu.org> * locale/lc-time.c (_nl_init_era_entries): Pass L'\0' instead of '\0' to wcschr.
-rw-r--r--ChangeLog5
-rw-r--r--locale/lc-time.c4
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 71c4db430f..b85c7d10be 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2000-12-02 H.J. Lu <hjl@gnu.org>
+
+ * locale/lc-time.c (_nl_init_era_entries): Pass L'\0' instead of
+ '\0' to wcschr.
+
2000-12-02 Ulrich Drepper <drepper@redhat.com>
* sysdeps/i386/fpu/s_frexp.S: Add missing fwait.
diff --git a/locale/lc-time.c b/locale/lc-time.c
index 1e76e10c76..d8fd6cfc21 100644
--- a/locale/lc-time.c
+++ b/locale/lc-time.c
@@ -121,11 +121,11 @@ _nl_init_era_entries (void)
/* Set and skip wide era name. */
eras[cnt].era_wname = (wchar_t *) ptr;
- ptr = (char *) (wcschr ((wchar_t *) ptr, '\0') + 1);
+ ptr = (char *) (wcschr ((wchar_t *) ptr, L'\0') + 1);
/* Set and skip wide era format. */
eras[cnt].era_wformat = (wchar_t *) ptr;
- ptr = (char *) (wcschr ((wchar_t *) ptr, '\0') + 1);
+ ptr = (char *) (wcschr ((wchar_t *) ptr, L'\0') + 1);
}
}
}