mirror of
git://sourceware.org/git/newlib-cygwin.git
synced 2025-02-21 00:07:36 +08:00
* libc/locale/timelocal.h (struct lc_time_T): Add missing ERA-related
members. * libc/locale/timelocal.c (_C_time_local): Set new members to empty strings. * libc/locale/nl_langinfo.c (nl_langinfo): Return values from __get_current_time_locale() for ERA related requests.
This commit is contained in:
parent
90f5de33d5
commit
f723b60cf2
@ -1,3 +1,12 @@
|
||||
2010-02-18 Corinna Vinschen <corinna@vinschen.de>
|
||||
|
||||
* libc/locale/timelocal.h (struct lc_time_T): Add missing ERA-related
|
||||
members.
|
||||
* libc/locale/timelocal.c (_C_time_local): Set new members to empty
|
||||
strings.
|
||||
* libc/locale/nl_langinfo.c (nl_langinfo): Return values from
|
||||
__get_current_time_locale() for ERA related requests.
|
||||
|
||||
2010-02-16 Corinna Vinschen <corinna@vinschen.de>
|
||||
|
||||
* libc/ctype/iswblank.c (iswblank): Remove Unicode characters
|
||||
|
@ -175,24 +175,19 @@ _DEFUN(nl_langinfo, (item),
|
||||
ret = (char*) __get_current_time_locale()->mon[_REL(ABMON_1)];
|
||||
break;
|
||||
case ERA:
|
||||
/* XXX: need to be implemented */
|
||||
ret = "";
|
||||
ret = (char*) __get_current_time_locale()->era;
|
||||
break;
|
||||
case ERA_D_FMT:
|
||||
/* XXX: need to be implemented */
|
||||
ret = "";
|
||||
ret = (char*) __get_current_time_locale()->era_d_fmt;
|
||||
break;
|
||||
case ERA_D_T_FMT:
|
||||
/* XXX: need to be implemented */
|
||||
ret = "";
|
||||
ret = (char*) __get_current_time_locale()->era_d_t_fmt;
|
||||
break;
|
||||
case ERA_T_FMT:
|
||||
/* XXX: need to be implemented */
|
||||
ret = "";
|
||||
ret = (char*) __get_current_time_locale()->era_t_fmt;
|
||||
break;
|
||||
case ALT_DIGITS:
|
||||
/* XXX: need to be implemented */
|
||||
ret = "";
|
||||
ret = (char*) __get_current_time_locale()->alt_digits;
|
||||
break;
|
||||
case RADIXCHAR:
|
||||
ret = (char*) __get_current_numeric_locale()->decimal_point;
|
||||
|
@ -92,7 +92,33 @@ static const struct lc_time_T _C_time_locale = {
|
||||
/* ampm_fmt
|
||||
* To determine 12-hour clock format time (empty, if N/A)
|
||||
*/
|
||||
"%I:%M:%S %p"
|
||||
"%I:%M:%S %p",
|
||||
|
||||
/* era
|
||||
* Era. This and the following entries are used if the alternative
|
||||
* date format is specified in strftime
|
||||
*/
|
||||
"",
|
||||
|
||||
/* era_d_fmt
|
||||
* Era date format used with the %Ex
|
||||
*/
|
||||
"",
|
||||
|
||||
/* era_d_t_fmt
|
||||
* Era date/time format (%Ec)
|
||||
*/
|
||||
"",
|
||||
|
||||
/* era_t_fmt
|
||||
* Era time format (%EX)
|
||||
*/
|
||||
"",
|
||||
|
||||
/* alt_digits
|
||||
* Alternate digits used if %O format prefix is specified
|
||||
*/
|
||||
""
|
||||
};
|
||||
|
||||
struct lc_time_T *
|
||||
|
@ -50,6 +50,11 @@ struct lc_time_T {
|
||||
const char *alt_month[12];
|
||||
const char *md_order;
|
||||
const char *ampm_fmt;
|
||||
const char *era;
|
||||
const char *era_d_fmt;
|
||||
const char *era_d_t_fmt;
|
||||
const char *era_t_fmt;
|
||||
const char *alt_digits;
|
||||
};
|
||||
|
||||
struct lc_time_T *__get_current_time_locale(void);
|
||||
|
Loading…
x
Reference in New Issue
Block a user