From 323fb88dac799cddfaa33cb80f7fc3395c2297e5 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Fri, 16 Jun 2000 23:04:41 +0000 Subject: Update. 2000-06-16 Ulrich Drepper * iconv/gconv_int.h (norm_add_slashes): Optionally add given suffix. * iconv/gconv_open.c: Remove error handling specification from `from' character set name. * intl/loadmsgcat.c (_nl_load_domain): Call norm_add_slashes with new parameter to always enable transliteration. * locale/localeinfo.h (LIMAGIC): Bump number because of incompatible change. (struct locale_data): Add new members use_translit and options. * locale/findlocale.c (_nl_find_locale): Set use_translit flag is character set name contained modifier TRANSLIT. * locale/loadlocale.c (_nl_load_locale): Initialize new use_translit and options fields. (_nl_unload_locale): Free options string if necessary. * wcsmbs/wcsmbsload.c (__wcsmbs_load_conv): Enable translation if the locale names suggested this. * locale/C-address.c: Add two new initialilzers to adjust data structure for new format. * locale/C-collate.c: Likewise. * locale/C-ctype.c: Likewise. * locale/C-identification.c: Likewise. * locale/C-measurement.c: Likewise. * locale/C-messages.c: Likewise. * locale/C-monetary.c: Likewise. * locale/C-name.c: Likewise. * locale/C-numeric.c: Likewise. * locale/C-paper.c: Likewise. * locale/C-telephone.c: Likewise. * locale/C-time.c: Likewise. * locale/setlocale.c: Add some more __builtin_expect. --- locale/C-telephone.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'locale/C-telephone.c') diff --git a/locale/C-telephone.c b/locale/C-telephone.c index 9647ac0da4..adf407db2c 100644 --- a/locale/C-telephone.c +++ b/locale/C-telephone.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1998 Free Software Foundation, Inc. +/* Copyright (C) 1998, 2000 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper , 1998. @@ -29,6 +29,8 @@ const struct locale_data _nl_C_LC_TELEPHONE = _nl_C_name, NULL, 0, 0, /* no file mapped */ UNDELETABLE, + 0, + NULL, 4, { { string: "+%c %a %l" }, -- cgit v1.2.3