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/gettextP.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/gettextP.h')
| -rw-r--r-- | intl/gettextP.h | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/intl/gettextP.h b/intl/gettextP.h index bcbe2720a7..bea4404167 100644 --- a/intl/gettextP.h +++ b/intl/gettextP.h @@ -1,6 +1,6 @@ /* Header describing internals of gettext library - Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc. - Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995. + Copyright (C) 1995, 1996, 1997, 1998, 1999 Free Software Foundation, Inc. + Written by Ulrich Drepper <drepper@cygnus.com>, 1995. The GNU C Library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as @@ -20,6 +20,10 @@ #ifndef _GETTEXTP_H #define _GETTEXTP_H +#if defined HAVE_ICONV || defined _LIBC +# include <iconv.h> +#endif + #include "loadinfo.h" /* @@ end of prolog @@ */ @@ -67,6 +71,10 @@ struct loaded_domain struct string_desc *trans_tab; nls_uint32 hash_size; nls_uint32 *hash_tab; +#if defined HAVE_ICONV || defined _LIBC + iconv_t conv; +#endif + char **conv_tab; }; struct binding |