Update.

	* locale/localeinfo.h (enum value_type): Add wstring, wstringarray,
	and wstringlist.
	* locale/categories.def: Mark wide char strings as wstring or
	stringarray.
	* locale/programs/locale.c (show_info): Handle wstring, wstringarray,
	and wstringlist.  Print keywords only if there is real output.
	Reported by Chen Xiangyang <chenxy@opencjk.org>.

	* sysdeps/sparc/fpu/bits/mathinline.h: Add __THROW where necessary.
	Patch by Ben Collins <bcollins@debian.org>.

1 files changed, 4 insertions, 1 deletions

diff --git a/locale/localeinfo.h b/locale/localeinfo.h
index 1a4fe6f543..984696e024 100644
--- a/locale/localeinfo.h
+++ b/locale/localeinfo.h
@@ -91,7 +91,10 @@ enum value_type
   bytearray,
   word,
   stringlist,
-  wordarray
+  wordarray,
+  wstring,
+  wstringarray,
+  wstringlist
 };