mirror of
git://sourceware.org/git/newlib-cygwin.git
synced 2025-01-16 19:40:07 +08:00
d16a56306d
- Remove charset parameter from low level __foo_wctomb/__foo_mbtowc calls. - Instead, create array of function for ISO and Windows codepages to point to function which does not require to evaluate the charset string on each call. Create matching helper functions. I.e., __iso_wctomb, __iso_mbtowc, __cp_wctomb and __cp_mbtowc are functions returning the right function pointer now. - Create __WCTOMB/__MBTOWC macros utilizing per-reent locale and replace calls to __wctomb/__mbtowc with calls to __WCTOMB/__MBTOWC. - Drop global __wctomb/__mbtowc vars. - Utilize aforementioned changes in Cygwin to get rid of charset in other, calling functions and simplify the code. - In Cygwin restrict global cygheap locale info to the job performed by internal_setlocale. Use UTF-8 instead of ASCII on the fly in internal conversion functions. - In Cygwin dll_entry, make sure to initialize a TLS area with a NULL _REENT->_locale pointer. Add comment to explain why. Signed-off by: Corinna Vinschen <corinna@vinschen.de>
64 lines
1.4 KiB
C
64 lines
1.4 KiB
C
/* Misc. local definitions for libc/stdlib */
|
|
|
|
#ifndef _LOCAL_H_
|
|
#define _LOCAL_H_
|
|
|
|
char * _EXFUN(_gcvt,(struct _reent *, double , int , char *, char, int));
|
|
|
|
#include "../locale/setlocale.h"
|
|
|
|
#ifndef __machine_mbstate_t_defined
|
|
#include <wchar.h>
|
|
#endif
|
|
|
|
typedef int wctomb_f (struct _reent *, char *, wchar_t, mbstate_t *);
|
|
typedef wctomb_f *wctomb_p;
|
|
|
|
wctomb_f __ascii_wctomb;
|
|
#ifdef _MB_CAPABLE
|
|
wctomb_f __utf8_wctomb;
|
|
wctomb_f __sjis_wctomb;
|
|
wctomb_f __eucjp_wctomb;
|
|
wctomb_f __jis_wctomb;
|
|
wctomb_p __iso_wctomb (int val);
|
|
wctomb_p __cp_wctomb (int val);
|
|
#ifdef __CYGWIN__
|
|
wctomb_f __gbk_wctomb;
|
|
wctomb_f __kr_wctomb;
|
|
wctomb_f __big5_wctomb;
|
|
#endif
|
|
#endif
|
|
|
|
#define __WCTOMB (__get_current_locale ()->wctomb)
|
|
|
|
typedef int mbtowc_f (struct _reent *, wchar_t *, const char *, size_t,
|
|
mbstate_t *);
|
|
typedef mbtowc_f *mbtowc_p;
|
|
|
|
mbtowc_f __ascii_mbtowc;
|
|
#ifdef _MB_CAPABLE
|
|
mbtowc_f __utf8_mbtowc;
|
|
mbtowc_f __sjis_mbtowc;
|
|
mbtowc_f __eucjp_mbtowc;
|
|
mbtowc_f __jis_mbtowc;
|
|
mbtowc_p __iso_mbtowc (int val);
|
|
mbtowc_p __cp_mbtowc (int val);
|
|
#ifdef __CYGWIN__
|
|
mbtowc_f __gbk_mbtowc;
|
|
mbtowc_f __kr_mbtowc;
|
|
mbtowc_f __big5_mbtowc;
|
|
#endif
|
|
#endif
|
|
|
|
#define __MBTOWC (__get_current_locale ()->mbtowc)
|
|
|
|
extern wchar_t __iso_8859_conv[14][0x60];
|
|
int __iso_8859_val_index (int);
|
|
int __iso_8859_index (const char *);
|
|
|
|
extern wchar_t __cp_conv[][0x80];
|
|
int __cp_val_index (int);
|
|
int __cp_index (const char *);
|
|
|
|
#endif
|