mirror of
git://sourceware.org/git/newlib-cygwin.git
synced 2025-01-15 11:00:04 +08:00
d47d5b850b
if __HAVE_LOCALE_INFO_EXTENDED__ is defined. * libc/include/langinfo.h (enum __nl_item): New type. Define all native values accessible through nl_langinfo. Define previously existing POSIX-compatible values as macros as well. * libc/include/stdlib.h (__mb_cur_max): Drop declaration. (__locale_mb_cur_max): Declare. (MB_CUR_MAX): Re-define calling __locale_mb_cur_max. * libc/locale/Makefile.am (ELIX_SOURCES): Add lctype.c. * libc/locale/Makefile.in: Regenerate. * libc/locale/lctype.c: New file to define and load LC_CTYPE category. * libc/locale/lctype.h: New file, matching header. * libc/locale/lmessages.c (_C_messages_locale): Add default values for wide char members. (__messages_load_locale): Add _C_messages_locale in call to __set_lc_messages_from_win. * libc/locale/lmessages.h (struct lc_messages_T): Add wide char members. * libc/locale/lmonetary.c (_C_monetary_locale): Add default values for wide char members. (__monetary_load_locale): Add _C_monetary_locale in call to __set_lc_monetary_from_win. * libc/locale/lmonetary.h (struct lc_monetary_T): Add wide char members. Add numerical values for international currency formatting per POSIX-1.2008, if __HAVE_LOCALE_INFO_EXTENDED__ is defined. * libc/locale/lnumeric.c (_C_numeric_locale): Add default values for wide char members. (__numeric_load_locale): Add _C_numeric_locale in call to __set_lc_numeric_from_win. * libc/locale/lnumeric.h (struct lc_numeric_T): Add wide char members. * libc/locale/locale.c (loadlocale): Return doing nothing if category locale didn't change. Convert category if chain to switch statement. Call __ctype_load_locale in LC_CTYPE case. (__locale_charset): Add (but disable for now) returning codeset from __get_current_ctype_locale. (__locale_mb_cur_max): Add (but disable for now) returning mb_cur_max from __get_current_ctype_locale. (__locale_msgcharset): Add returning codeset from __get_current_messages_locale. (_localeconv_r): Accommodate int_XXX values. * libc/locale/nl_langinfo.c (nl_ext): New array to define what is to be returned for non-POSIX values. (nl_Langinfo): Return correct codeset for each locale category. Return extended values if __HAVE_LOCALE_INFO_EXTENDED__ is defined. * libc/locale/timelocal.c (_C_time_locale): Add default values for wide char members. (__time_load_locale): Add _C_time_locale in call to __set_lc_time_from_win. * libc/locale/timelocal.h (struct lc_time_T): Add wide char members. * libc/stdio/vfwprintf.c (_VFWPRINTF_R): Use wide char decimal point and thousands_sep if __HAVE_LOCALE_INFO_EXTENDED__ is defined. * libc/time/strftime.c: Rework to accommodate availability of wide char strings in LC_TIME category if __HAVE_LOCALE_INFO_EXTENDED__ is defined.
86 lines
2.7 KiB
C
86 lines
2.7 KiB
C
/*-
|
|
* Copyright (c) 1997-2002 FreeBSD Project.
|
|
* All rights reserved.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions
|
|
* are met:
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer.
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
* documentation and/or other materials provided with the distribution.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
|
|
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
|
* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
|
|
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
|
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
|
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
|
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
|
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
|
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
|
* SUCH DAMAGE.
|
|
*
|
|
* $FreeBSD: src/lib/libc/stdtime/timelocal.h,v 1.11 2002/01/24 15:07:44 phantom Exp $
|
|
*/
|
|
|
|
#ifndef _TIMELOCAL_H_
|
|
#define _TIMELOCAL_H_
|
|
|
|
#include <_ansi.h>
|
|
#include <sys/cdefs.h>
|
|
#include <wchar.h>
|
|
|
|
__BEGIN_DECLS
|
|
|
|
/*
|
|
* Private header file for the strftime and strptime localization
|
|
* stuff.
|
|
*/
|
|
struct lc_time_T {
|
|
const char *mon[12];
|
|
const char *month[12];
|
|
const char *wday[7];
|
|
const char *weekday[7];
|
|
const char *X_fmt;
|
|
const char *x_fmt;
|
|
const char *c_fmt;
|
|
const char *am_pm[2];
|
|
const char *date_fmt;
|
|
const char *alt_month[12]; /* unused */
|
|
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;
|
|
#ifdef __HAVE_LOCALE_INFO_EXTENDED__
|
|
const char *codeset; /* codeset for mbtowc conversion */
|
|
const wchar_t *wmon[12];
|
|
const wchar_t *wmonth[12];
|
|
const wchar_t *wwday[7];
|
|
const wchar_t *wweekday[7];
|
|
const wchar_t *wX_fmt;
|
|
const wchar_t *wx_fmt;
|
|
const wchar_t *wc_fmt;
|
|
const wchar_t *wam_pm[2];
|
|
const wchar_t *wdate_fmt;
|
|
const wchar_t *wampm_fmt;
|
|
const wchar_t *wera;
|
|
const wchar_t *wera_d_fmt;
|
|
const wchar_t *wera_d_t_fmt;
|
|
const wchar_t *wera_t_fmt;
|
|
const wchar_t *walt_digits;
|
|
#endif
|
|
};
|
|
|
|
struct lc_time_T *__get_current_time_locale(void);
|
|
int __time_load_locale(const char *, void *, const char *);
|
|
|
|
__END_DECLS
|
|
|
|
#endif /* !_TIMELOCAL_H_ */
|