diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2005-12-20 18:05:57 +0000 |
|---|---|---|
| committer | Jakub Jelinek <jakub@redhat.com> | 2005-12-20 18:05:57 +0000 |
| commit | 2bf037b4e8e189e910a41744d79404b94235ab8b (patch) | |
| tree | ec0234c3f56396c982e3ed5a77780423502a111f /iconv/gconv_cache.c | |
| parent | 20a911071d1cfaf7d20d088efe9ede27c5809c09 (diff) | |
Updated to fedora-glibc-20051220T1751cvs/fedora-glibc-2_3_90-21
Diffstat (limited to 'iconv/gconv_cache.c')
| -rw-r--r-- | iconv/gconv_cache.c | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/iconv/gconv_cache.c b/iconv/gconv_cache.c index 9b695c377d..9a8a20816c 100644 --- a/iconv/gconv_cache.c +++ b/iconv/gconv_cache.c @@ -1,5 +1,5 @@ /* Cache handling for iconv modules. - Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc. + Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 2001. @@ -209,7 +209,18 @@ find_module (const char *directory, const char *filename, /* Call the init function. */ if (result->__init_fct != NULL) - status = DL_CALL_FCT (result->__init_fct, (result)); + { + __gconv_init_fct init_fct = result->__init_fct; +#ifdef PTR_DEMANGLE + PTR_DEMANGLE (init_fct); +#endif + status = DL_CALL_FCT (init_fct, (result)); + +#ifdef PTR_MANGLE + if (result->__btowc_fct != NULL) + PTR_MANGLE (result->__btowc_fct); +#endif + } } return status; |