JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Get rid of LCID, reformat type definitions in setlocale.h

Browse Source 
Definition of LCID results in build problems on 32 bit Cygwin

Signed-off by: Corinna Vinschen <corinna@vinschen.de>
This commit is contained in:
Corinna Vinschen
2016-07-25 12:30:25 +02:00
parent 7156bf842e
commit ac7f1d5e93
1 changed files with 94 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
newlib/libc/locale/setlocale.h
View File

@@ -44,18 +44,18 @@ __BEGIN_DECLS
#define _LC_LAST 7
#ifdef __CYGWIN__
typedef __uint32_t LCID;
struct lc_collate_T
{
LCID lcid;
int (*mbtowc) (struct _reent *, wchar_t *, const char *, size_t, mbstate_t *);
__uint32_t lcid;
int (*mbtowc) (struct _reent *, wchar_t *, const char *, size_t,
mbstate_t *);
char codeset[ENCODING_LEN + 1];
};
extern const struct lc_collate_T _C_collate_locale;
#endif
struct lc_ctype_T {
struct lc_ctype_T
{
const char *codeset; /* codeset for mbtowc conversion */
const char *mb_cur_max;
#ifdef __HAVE_LOCALE_INFO_EXTENDED__
@@ -65,7 +65,8 @@ struct lc_ctype_T {
};
extern const struct lc_ctype_T _C_ctype_locale;
struct lc_monetary_T {
struct lc_monetary_T
{
const char *int_curr_symbol;
const char *currency_symbol;
const char *mon_decimal_point;
@@ -99,7 +100,8 @@ struct lc_monetary_T {
};
extern const struct lc_monetary_T _C_monetary_locale;
struct lc_numeric_T {
struct lc_numeric_T
{
const char *decimal_point;
const char *thousands_sep;
const char *grouping;
@@ -111,7 +113,8 @@ struct lc_numeric_T {
};
extern const struct lc_numeric_T _C_numeric_locale;
struct lc_time_T {
struct lc_time_T
{
const char *mon[12];
const char *month[12];
const char *wday[7];
@@ -150,7 +153,8 @@ struct lc_time_T {
};
extern const struct lc_time_T _C_time_locale;
struct lc_messages_T {
struct lc_messages_T
{
const char *yesexpr;
const char *noexpr;
const char *yesstr;