From c90a2db6e0c4661091a9c5b1454a9beffc611e9e Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Sun, 22 Aug 1999 22:39:16 +0000 Subject: Update. 1999-08-22 Ulrich Drepper * iconv/gconv_int.h (GCONV_AVOID_NOCONV): New definition. (__gconv_find_transform): Update prototype. (__gconv_open): Likewise. * iconv/gconv_open.c: Take extra parameter and pass it to __gconv_find_transform. * iconv/gconv_db.c (__gconv_find_transform): Take extra parameter with flags. If GCONV_AVOID_NOCONV flag is set don't return copying transformation. * iconv/iconv_open.c: Pass extra parameter to __gconv_open. * wcsmbs/wcsmbsload.c: Likewise. * intl/dcgettext.c (_nl_find_msg): Rewrite to use gconv instead of iconv for glibc. * intl/gettextP.h: Likewise. * intl/loadmsgcat.c: Likewise. * posix/regexbug1.c: New file. * posix/Makefile (tests): Add regexbug1. --- intl/gettextP.h | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'intl/gettextP.h') diff --git a/intl/gettextP.h b/intl/gettextP.h index bea4404167..1b4dcb3e07 100644 --- a/intl/gettextP.h +++ b/intl/gettextP.h @@ -20,8 +20,12 @@ #ifndef _GETTEXTP_H #define _GETTEXTP_H -#if defined HAVE_ICONV || defined _LIBC -# include +#ifdef _LIBC +# include "../iconv/gconv_int.h" +#else +# if HAVE_ICONV +# include +# endif #endif #include "loadinfo.h" @@ -71,8 +75,12 @@ struct loaded_domain struct string_desc *trans_tab; nls_uint32 hash_size; nls_uint32 *hash_tab; -#if defined HAVE_ICONV || defined _LIBC +#ifdef _LIBC + __gconv_t conv; +#else +# if HAVE_ICONV iconv_t conv; +# endif #endif char **conv_tab; }; -- cgit v1.2.3