diff options
author | Ulrich Drepper <drepper@redhat.com> | 1999-08-20 19:52:54 +0000 |
---|---|---|
committer | Ulrich Drepper <drepper@redhat.com> | 1999-08-20 19:52:54 +0000 |
commit | 6570e194e60822d81d6df31e260985e6a13b0f2a (patch) | |
tree | 505bc4144874d98bb1a19417ac3e69fe95debae9 /intl/loadinfo.h | |
parent | be7d999a0931203c5541714a255635459ee6dde2 (diff) | |
download | glibc-6570e194e60822d81d6df31e260985e6a13b0f2a.tar.gz glibc-6570e194e60822d81d6df31e260985e6a13b0f2a.tar.xz glibc-6570e194e60822d81d6df31e260985e6a13b0f2a.zip |
Update.
* intl/gettextP.h (struct loaded_domain): Add conv element. * intl/dcgettext.c (find_msg): Rename to _nl_find_msg and make public. Instead of returning found message directly convert it using iconv if a conversion was found when opening the file. * intl/loadinfo.h: Protect against multiple inclusion. Declare _nl_find_msg. * intl/loadmsgcat.c (_nl_load_domain): Try to determine charset used in the message file and if necessary find approrpiate conversion to match currently selected charset.
Diffstat (limited to 'intl/loadinfo.h')
-rw-r--r-- | intl/loadinfo.h | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/intl/loadinfo.h b/intl/loadinfo.h index 35d98f0d9b..ea1bf05806 100644 --- a/intl/loadinfo.h +++ b/intl/loadinfo.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1996, 1997, 1998 Free Software Foundation, Inc. +/* Copyright (C) 1996, 1997, 1998, 1999 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996. @@ -17,6 +17,9 @@ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#ifndef _LOADINFO_H +#define _LOADINFO_H 1 + #ifndef PARAMS # if __STDC__ # define PARAMS(args) args @@ -77,3 +80,10 @@ extern int _nl_explode_name PARAMS ((char *name, const char **language, const char **revision)); extern char *_nl_find_language PARAMS ((const char *name)); + + +extern char *_nl_find_msg PARAMS ((struct loaded_l10nfile *domain_file, + const char *msgid)) + internal_function; + +#endif /* loadinfo.h */ |