From 289e8e7ea11afad41aaac7d43400bf4ee28aada5 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Sat, 1 Apr 2000 17:53:24 +0000 Subject: [PATCH] Update. * locale/programs/ld-collate.c (check_duplicate): Allow repertoire to be missing. --- ChangeLog | 3 +++ locale/programs/ld-collate.c | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 92a8849..42b51ea 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2000-04-01 Ulrich Drepper + * locale/programs/ld-collate.c (check_duplicate): Allow repertoire + to be missing. + * sysdeps/unix/sysv/linux/init-first.c (init): Add code from former init-first.h. Initialize __libc_multiple_libcs. diff --git a/locale/programs/ld-collate.c b/locale/programs/ld-collate.c index aee98df..9b9db42 100644 --- a/locale/programs/ld-collate.c +++ b/locale/programs/ld-collate.c @@ -347,7 +347,9 @@ check_duplicate (struct linereader *ldfile, struct locale_collate_t *collate, return 1; } - if (find_entry (&repertoire->char_table, symbol, symbol_len, &ignore) == 0) + if (repertoire != NULL + && (find_entry (&repertoire->char_table, symbol, symbol_len, &ignore) + == 0)) { lr_error (ldfile, _("`%.*s' already defined in repertoire"), (int) symbol_len, symbol); -- 2.7.4