diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2002-08-29 06:50:10 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2002-08-29 06:50:10 +0000 |
| commit | 01beb5b9ff8fb38f6517837b42eea8f5ff7060d9 (patch) | |
| tree | 5c1b871d23c7d13cf5f6cdcbccb13c1ca281e09c /wcsmbs/wcsmbsload.h | |
| parent | 653e58951271cf55a3b2d778ea02107b9ea44d78 (diff) | |
Update.
2002-08-28 Ulrich Drepper <drepper@redhat.com>
* include/wchar.h: Declare __mbsrtowcs_l.
* wcsmbs/Makefile (routines): Add mbsrtowcs_l.
* wcsmbs/mbsrtowcs.c: Add support for compilation with
USE_IN_EXTENDED_LOCALE_MODEL.
* wcsmbs/mbsrtowcs_l: New file.
* wcsmbs/wcsmbsload.c (__wcsmbs_to_wc): Renamed from to_wc. Don't
define as static. Change all uses.
(__wcsmbs_getfct): Renamed from getfct. Don't define as static.
Change all callers.
* wcsmbs/wcsmbsload.h: Declare __wcsmbs_to_wc and __wcsmbs_getfct.
* time/strftime.c: When translating for the extended locale model
use the _l functions.
* time/Makefile (tests): Add tst-ftime_l.
* time/tst-ftime_l.c: New file.
Diffstat (limited to 'wcsmbs/wcsmbsload.h')
| -rw-r--r-- | wcsmbs/wcsmbsload.h | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/wcsmbs/wcsmbsload.h b/wcsmbs/wcsmbsload.h index 1fcb42c033..b7594ce5e9 100644 --- a/wcsmbs/wcsmbsload.h +++ b/wcsmbs/wcsmbsload.h @@ -17,6 +17,9 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ +#ifndef _WCSMBSLOAD_H +#define _WCSMBSLOAD_H 1 + #include <locale.h> #include <wchar.h> #include <locale/localeinfo.h> @@ -52,6 +55,19 @@ extern int __wcsmbs_named_conv (struct gconv_fcts *copy, const char *name) internal_function; +#include <iconv/gconv_int.h> + + +/* Variable for conversion from ASCII to wchar_t. */ +extern struct __gconv_step __wcsmbs_to_wc attribute_hidden; + + +/* Load the function implementation if necessary. */ +extern struct __gconv_step *__wcsmbs_getfct (const char *to, const char *from, + size_t *nstepsp) + attribute_hidden; + + /* Check whether the LC_CTYPE locale changed since the last call. Update the pointers appropriately. */ static inline void @@ -60,3 +76,5 @@ update_conversion_ptrs (void) if (__wcsmbs_last_locale != _NL_CURRENT_DATA (LC_CTYPE)) __wcsmbs_load_conv (_NL_CURRENT_DATA (LC_CTYPE)); } + +#endif /* wcsmbsload.h */ |