* libc/locale/lmonetary.c (__monetary_load_locale): Take additional

	parameters for wide char to multibyte conversion.  Call
	__set_lc_monetary_from_win on Cygwin.
	* libc/locale/lmonetary.h: Make C++-safe.
	(__monetary_load_locale): Change declaration.
	* libc/locale/lnumeric.c (__numeric_load_locale): Take additional
	parameters for wide char to multibyte conversion.  Call
	__set_lc_numeric_from_win on Cygwin.
	* libc/locale/lnumeric.h: Make C++-safe.
	(__numeric_load_locale): Change declaration.
	* libc/locale/locale.c (lconv): De-constify for Cygwin.
	(__set_charset_from_locale): Rename from
	__set_charset_from_codepage.  Take locale as parameter instead of
	a codepage.
	(loadlocale): Allow "EUC-JP" for "EUCJP" and "EUC-KR" for "EUCKR".
	Change documnetation accordingly.  Enable LC_COLLATE, LC_MONETARY,
	LC_NUMERIC, and LC_TIME handling on Cygwin.
	(_localeconv_r): On Cygwin, copy values from monetary and numeric
	domain if change has been noted.
	* libc/locale/nl_langinfo.c (nl_langinfo): Accommodate change of
	am/pm layout in struct lc_time_T.
	* libc/locale/timelocal.c (_C_time_locale): Accommodate
	redefinition of am/pm members.
	(__time_load_locale): Take additional parameters for wide char
	to multibyte conversion.  Call __set_lc_time_from_win on Cygwin.
	* libc/locale/timelocal.h: Make C++-safe.
	(struct lc_time_T): Convert am and pm to a am_pm array for easier
	consumption by strftime and strptime.
	(__time_load_locale): Change declaration.
	* libc/time/strftime.c: Change documentation to reflect changes to
	strftime.  Remove locale constant strings in favor of access to
	locale-specifc data.
	(_ctloc): Define access method for locale-specifc data.
	(TOLOWER): Define for tolower conversion.
	(strftime): Throughout, convert locale-specific formats to use
	locale-specific data.  Add GNU-specific "%P" format.
	* libc/time/strptime.c: Remove locale constant strings in favor of
	access to locale-specifc data.
	(_ctloc): Define access method for locale-specifc data.
	(strptime): Throughout, convert locale-specific formats to use
	locale-specific data.

1 files changed, 8 insertions, 3 deletions

diff --git a/newlib/libc/locale/timelocal.h b/newlib/libc/locale/timelocal.h
index 0b0a59a48..e232a7304 100644
--- a/newlib/libc/locale/timelocal.h
+++ b/newlib/libc/locale/timelocal.h
@@ -29,6 +29,10 @@
 #ifndef _TIMELOCAL_H_
 #define	_TIMELOCAL_H_
 
+#include <sys/cdefs.h>
+
+__BEGIN_DECLS
+
 /*
  * Private header file for the strftime and strptime localization
  * stuff.
@@ -41,8 +45,7 @@ struct lc_time_T {
 	const char	*X_fmt;
 	const char	*x_fmt;
 	const char	*c_fmt;
-	const char	*am;
-	const char	*pm;
+	const char	*am_pm[2];
 	const char	*date_fmt;
 	const char	*alt_month[12];
 	const char	*md_order;
@@ -50,6 +53,8 @@ struct lc_time_T {
 };
 
 struct lc_time_T *__get_current_time_locale(void);
-int	__time_load_locale(const char *);
+int	__time_load_locale(const char *, void *, const char *);
+
+__END_DECLS
 
 #endif /* !_TIMELOCAL_H_ */