LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Refresh locale.h from bionic"

Browse Source
This commit is contained in:
Andrew Hsieh
2014-03-29 03:07:31 +00:00
committed by Gerrit Code Review
parent 1782523e75 cd9dfd0ffd
commit ac982541a9
1 changed files with 32 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
ndk/platforms/android-20/include/locale.h
View File

@@ -51,12 +51,41 @@ enum {
extern char* setlocale(int, const char*); extern char* setlocale(int, const char*);
#if !defined(__LP64__) #if defined(__LP64__)
// TODO: LP32 had these bogus declarations but LP64 should have a real struct lconv and localeconv(3). struct lconv {
char* decimal_point;
char* thousands_sep;
char* grouping;
char* int_curr_symbol;
char* currency_symbol;
char* mon_decimal_point;
char* mon_thousands_sep;
char* mon_grouping;
char* positive_sign;
char* negative_sign;
char int_frac_digits;
char frac_digits;
char p_cs_precedes;
char p_sep_by_space;
char n_cs_precedes;
char n_sep_by_space;
char p_sign_posn;
char n_sign_posn;
/* ISO-C99 */
char int_p_cs_precedes;
char int_p_sep_by_space;
char int_n_cs_precedes;
char int_n_sep_by_space;
char int_p_sign_posn;
char int_n_sign_posn;
};
#else
// Keep old declaration for ILP32 for compatibility
struct lconv { }; struct lconv { };
struct lconv* localeconv(void);
#endif #endif
struct lconv* localeconv(void);
__END_DECLS __END_DECLS
#endif /* _LOCALE_H_ */ #endif /* _LOCALE_H_ */