* cygwin.din (__locale_mb_cur_max): Export.

* nlsfuncs.cc (__getlocaleinfo): Drop conversion to multibyte.
	(__charfromwchar): New function to convert to multibyte.
	(__eval_datetimefmt): Convert to return wchar_t pointer.  Work on
	wide char string.
	(__set_lc_time_from_win): Take additional pointer to "C" category info
	to accommodate C.foo locales.  Rework to fill wide char members in
	category info.
	(__set_lc_ctype_from_win): New function.
	(__set_lc_numeric_from_win): Take additional pointer to "C" category
	info to accommodate C.foo locales.  Rework to fill wide char members
	in category info.
	(__set_lc_monetary_from_win): Ditto.
	(__set_lc_messages_from_win): Ditto.
	(__get_current_collate_codeset): New function, called from nl_langinfo.
	* include/cygwin/config.h (__HAVE_LOCALE_INFO_EXTENDED__): Define.

winsup/cygwin/ChangeLog

@@ -1,3 +1,22 @@
+2010-04-28  Corinna Vinschen  <corinna@vinschen.de>
+
+	* cygwin.din (__locale_mb_cur_max): Export.
+	* nlsfuncs.cc (__getlocaleinfo): Drop conversion to multibyte.
+	(__charfromwchar): New function to convert to multibyte.
+	(__eval_datetimefmt): Convert to return wchar_t pointer.  Work on
+	wide char string.
+	(__set_lc_time_from_win): Take additional pointer to "C" category info
+	to accommodate C.foo locales.  Rework to fill wide char members in
+	category info.
+	(__set_lc_ctype_from_win): New function.
+	(__set_lc_numeric_from_win): Take additional pointer to "C" category
+	info to accommodate C.foo locales.  Rework to fill wide char members
+	in category info.
+	(__set_lc_monetary_from_win): Ditto.
+	(__set_lc_messages_from_win): Ditto.
+	(__get_current_collate_codeset): New function, called from nl_langinfo.
+	* include/cygwin/config.h (__HAVE_LOCALE_INFO_EXTENDED__): Define.
+
 2010-04-27  Christopher Faylor  <me+cygwin@cgf.cx>
 
 	* spawn.cc (find_exec): Use the first detected errno when lookup fails.

winsup/cygwin/cygwin.din

@@ -899,6 +899,7 @@ llistxattr SIGFE
 llrint = _f_llrint NOSIGFE
 llrintf = _f_llrintf NOSIGFE
 llrintl = _f_llrintl NOSIGFE
+__locale_mb_cur_max NOSIGFE
 localeconv NOSIGFE
 _localeconv = localeconv NOSIGFE
 localtime SIGFE

winsup/cygwin/include/cygwin/config.h

@@ -54,6 +54,7 @@ extern char *_tlsbase __asm__ ("%fs:4");
 #define __LINUX_ERRNO_EXTENSIONS__ 1
 #define _MB_EXTENDED_CHARSETS_ALL 1
 #define __HAVE_LOCALE_INFO__ 1
+#define __HAVE_LOCALE_INFO_EXTENDED__ 1
 #define _WANT_C99_TIME_FORMATS 1
 #if defined(__INSIDE_CYGWIN__) || defined(_COMPILING_NEWLIB)
 #define __EXPORT __declspec(dllexport)