* ctype.cc: Remove implementation of ctype functions in favor of

	pointer-based newlib implementation.
	(_ctype_b): Declare.
	(__ctype_cp): Move to newlib. Declare.
	(__ctype_iso): Ditto.
	(__set_ctype): Implement changing __ctype_ptr__.  Only copy character
	class data in applications built under older Cygwin.
	* cygwin.din (__ctype_ptr__): Export.
	* include/ctype.h: Remove in favor of newlib implementation.
	* include/cygwin/config.h (__EXPORT): Define alongside __IMPORT.
	* include/cygwin/version.h (CYGWIN_VERSION_CHECK_FOR_OLD_CTYPE):
	Define check for old vs. new ctype implementation.
	Bump API minor number.

6 files changed, 48 insertions, 822 deletions

diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 74d6fd353..e0b3647e2 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,19 @@
+2009-03-31  Corinna Vinschen  <corinna@vinschen.de>
+
+	* ctype.cc: Remove implementation of ctype functions in favor of
+	pointer-based newlib implementation.
+	(_ctype_b): Declare.
+	(__ctype_cp): Move to newlib. Declare.
+	(__ctype_iso): Ditto.
+	(__set_ctype): Implement changing __ctype_ptr__.  Only copy character
+	class data in applications built under older Cygwin.
+	* cygwin.din (__ctype_ptr__): Export.
+	* include/ctype.h: Remove in favor of newlib implementation.
+	* include/cygwin/config.h (__EXPORT): Define alongside __IMPORT.
+	* include/cygwin/version.h (CYGWIN_VERSION_CHECK_FOR_OLD_CTYPE):
+	Define check for old vs. new ctype implementation.
+	Bump API minor number.
+
 2009-03-28  Christopher Faylor  <me+cygwin@cgf.cx>
 
 	* Makefile.in: Perform some minor cleanup.  Revamp speclib handling.
diff --git a/winsup/cygwin/ctype.cc b/winsup/cygwin/ctype.cc
index 5d70b6118..e0d6e7162 100644
--- a/winsup/cygwin/ctype.cc
+++ b/winsup/cygwin/ctype.cc
@@ -4,745 +4,7 @@ extern "C" {
 #include <stdlib.h>
 #include <wctype.h>
 
-#define _CTYPE_DATA_0_127 \
-	_C,	_C,	_C,	_C,	_C,	_C,	_C,	_C, \
-	_C,	_B|_C|_S, _C|_S, _C|_S,	_C|_S,	_C|_S,	_C,	_C, \
-	_C,	_C,	_C,	_C,	_C,	_C,	_C,	_C, \
-	_C,	_C,	_C,	_C,	_C,	_C,	_C,	_C, \
-	_S|_B,	_P,	_P,	_P,	_P,	_P,	_P,	_P, \
-	_P,	_P,	_P,	_P,	_P,	_P,	_P,	_P, \
-	_N,	_N,	_N,	_N,	_N,	_N,	_N,	_N, \
-	_N,	_N,	_P,	_P,	_P,	_P,	_P,	_P, \
-	_P,	_U|_X,	_U|_X,	_U|_X,	_U|_X,	_U|_X,	_U|_X,	_U, \
-	_U,	_U,	_U,	_U,	_U,	_U,	_U,	_U, \
-	_U,	_U,	_U,	_U,	_U,	_U,	_U,	_U, \
-	_U,	_U,	_U,	_P,	_P,	_P,	_P,	_P, \
-	_P,	_L|_X,	_L|_X,	_L|_X,	_L|_X,	_L|_X,	_L|_X,	_L, \
-	_L,	_L,	_L,	_L,	_L,	_L,	_L,	_L, \
-	_L,	_L,	_L,	_L,	_L,	_L,	_L,	_L, \
-	_L,	_L,	_L,	_P,	_P,	_P,	_P,	_C
-
-#define _CTYPE_DATA_128_256 \
-	0,	0,	0,	0,	0,	0,	0,	0, \
-	0,	0,	0,	0,	0,	0,	0,	0, \
-	0,	0,	0,	0,	0,	0,	0,	0, \
-	0,	0,	0,	0,	0,	0,	0,	0, \
-	0,	0,	0,	0,	0,	0,	0,	0, \
-	0,	0,	0,	0,	0,	0,	0,	0, \
-	0,	0,	0,	0,	0,	0,	0,	0, \
-	0,	0,	0,	0,	0,	0,	0,	0, \
-	0,	0,	0,	0,	0,	0,	0,	0, \
-	0,	0,	0,	0,	0,	0,	0,	0, \
-	0,	0,	0,	0,	0,	0,	0,	0, \
-	0,	0,	0,	0,	0,	0,	0,	0, \
-	0,	0,	0,	0,	0,	0,	0,	0, \
-	0,	0,	0,	0,	0,	0,	0,	0, \
-	0,	0,	0,	0,	0,	0,	0,	0, \
-	0,	0,	0,	0,	0,	0,	0,	0 
-
-/* FIXME: These tables should rather be defined in newlib and we should
-   switch to the newer __ctype_ptr method from newlib for new applications. */
-
-static char __ctype_default[128] = { _CTYPE_DATA_128_256 };
-static char __ctype_iso[15][128] = {
-  /* ISO-8859-1 */
- {      _C,     _C,     _C,     _C,     _C,     _C,     _C,     _C,
-        _C,     _C,     _C,     _C,     _C,     _C,     _C,     _C,
-        _C,     _C,     _C,     _C,     _C,     _C,     _C,     _C,
-        _C,     _C,     _C,     _C,     _C,     _C,     _C,     _C,
-        _S|_B,  _P,     _P,     _P,     _P,     _P,     _P,     _P,
-        _P,     _P,     _P,     _P,     _P,     _P,     _P,     _P,
-        _P,     _P,     _P,     _P,     _P,     _P,     _P,     _P,
-        _P,     _P,     _P,     _P,     _P,     _P,     _P,     _P,
-        _U,     _U,     _U,     _U,     _U,     _U,     _U,     _U,
-        _U,     _U,     _U,     _U,     _U,     _U,     _U,     _U,
-        _U,     _U,     _U,     _U,     _U,     _U,     _U,     _P,
-        _U,     _U,     _U,     _U,     _U,     _U,     _U,     _L,
-        _L,     _L,     _L,     _L,     _L,     _L,     _L,     _L,
-        _L,     _L,     _L,     _L,     _L,     _L,     _L,     _L,
-        _L,     _L,     _L,     _L,     _L,     _L,     _L,     _P,
-        _L,     _L,     _L,     _L,     _L,     _L,     _L,     _L },
-  /* ISO-8859-2 */
-  {	_C,     _C,     _C,     _C,     _C,     _C,     _C,     _C, 
-        _C,     _C,     _C,     _C,     _C,     _C,     _C,     _C, 
-        _C,     _C,     _C,     _C,     _C,     _C,     _C,     _C, 
-        _C,     _C,     _C,     _C,     _C,     _C,     _C,     _C, 
-	_S|_B,	_U,	_P,	_U,	_P,	_U,	_U,	_P, 
-	_P,	_U,	_U,	_U,	_U,	_P,	_U,	_U, 
-	_P,	_L,	_P,	_L,	_P,	_L,	_L,	_P, 
-	_P,	_L,	_L,	_L,	_L,	_P,	_L,	_L, 
-        _U,     _U,     _U,     _U,     _U,     _U,     _U,     _U, 
-        _U,     _U,     _U,     _U,     _U,     _U,     _U,     _U, 
-        _U,     _U,     _U,     _U,     _U,     _U,     _U,     _P, 
-        _U,     _U,     _U,     _U,     _U,     _U,     _U,     _L, 
-        _L,     _L,     _L,     _L,     _L,     _L,     _L,     _L, 
-        _L,     _L,     _L,     _L,     _L,     _L,     _L,     _L, 
-        _L,     _L,     _L,     _L,     _L,     _L,     _L,     _P, 
-        _L,     _L,     _L,     _L,     _L,     _L,     _L,     _L },
-  /* ISO-8859-3 */
-  {	_C,     _C,     _C,     _C,     _C,     _C,     _C,     _C, 
-        _C,     _C,     _C,     _C,     _C,     _C,     _C,     _C, 
-        _C,     _C,     _C,     _C,     _C,     _C,     _C,     _C, 
-        _C,     _C,     _C,     _C,     _C,     _C,     _C,     _C, 
-	_S|_B,	_U,	_P,	_P,	_P,	0,	_U,	_P, 
-	_P,	_U,	_U,	_U,	_U,	_P,	0,	_U, 
-	_P,	_L,	_P,	_P,	_P,	_L,	_L,	_P, 
-	_P,	_L,	_L,	_L,	_L,	_P,	0,	_L, 
-	_U,	_U,	_U,	0,	_U,	_U,	_U,	_U, 
-	_U,	_U,	_U,	_U,	_U,	_U,	_U,	_U, 
-	0,	_U,	_U,	_U,	_U,	_U,	_U,	_P, 
-	_U,	_U,	_U,	_U,	_U,	_U,	_U,	_L, 
-	_L,	_L,	_L,	0,	_L,	_L,	_L,	_L, 
-	_L,	_L,	_L,	_L,	_L,	_L,	_L,	_L, 
-	0,	_L,	_L,	_L,	_L,	_L,	_L,	_P, 
-	_L,	_L,	_L,	_L,	_L,	_L,	_L,	_P },
-  /* ISO-8859-4 */
-  {	_C,     _C,     _C,     _C,     _C,     _C,     _C,     _C, 
-        _C,     _C,     _C,     _C,     _C,     _C,     _C,     _C, 
-        _C,     _C,     _C,     _C,     _C,     _C,     _C,     _C, 
-        _C,     _C,     _C,     _C,     _C,     _C,     _C,     _C, 
-	_S|_B,	_U,	_L,	_U,	_P,	_U,	_U,	_P, 
-	_P,	_U,	_U,	_U,	_U,	_P,	_U,	_P, 
-	_P,	_L,	_P,	_L,	_P,	_L,	_L,	_P, 
-	_P,	_L,	_L,	_L,	_L,	_P,	_L,	_L, 
-        _U,     _U,     _U,     _U,     _U,     _U,     _U,     _U, 
-        _U,     _U,     _U,     _U,     _U,     _U,     _U,     _U, 
-        _U,     _U,     _U,     _U,     _U,     _U,     _U,     _P, 
-        _U,     _U,     _U,     _U,     _U,     _U,     _U,     _L, 
-        _L,     _L,     _L,     _L,     _L,     _L,     _L,     _L, 
-        _L,     _L,     _L,     _L,     _L,     _L,     _L,     _L, 
-        _L,     _L,     _L,     _L,     _L,     _L,     _L,     _P, 
-        _L,     _L,     _L,     _L,     _L,     _L,     _L,     _L },
-  /* ISO-8859-5 */
-  {	_C,     _C,     _C,     _C,     _C,     _C,     _C,     _C, 
-        _C,     _C,     _C,     _C,     _C,     _C,     _C,     _C, 
-        _C,     _C,     _C,     _C,     _C,     _C,     _C,     _C, 
-        _C,     _C,     _C,     _C,     _C,     _C,     _C,     _C, 
-	_S|_B,	_U,	_U,	_U,	_U,	_U,	_U,	_U, 
-	_U,	_U,	_U,	_U,	_U,	_P,	_U,	_U, 
-	_U,	_U,	_U,	_U,	_U,	_U,	_U,	_U, 
-	_U,	_U,	_U,	_U,	_U,	_U,	_U,	_U, 
-        _U,     _U,     _U,     _U,     _U,     _U,     _U,     _U, 
-        _U,     _U,     _U,     _U,     _U,     _U,     _U,     _U, 
-        _L,     _L,     _L,     _L,     _L,     _L,     _L,     _L, 
-        _L,     _L,     _L,     _L,     _L,     _L,     _L,     _L, 
-        _L,     _L,     _L,     _L,     _L,     _L,     _L,     _L, 
-        _L,     _L,     _L,     _L,     _L,     _L,     _L,     _L, 
-        _P,     _L,     _L,     _L,     _L,     _L,     _L,     _L, 
-        _L,     _L,     _L,     _L,     _L,     _P,     _L,     _L },
-  /* ISO-8859-6 */
-  {	_C,     _C,     _C,     _C,     _C,     _C,     _C,     _C, 
-        _C,     _C,     _C,     _C,     _C,     _C,     _C,     _C, 
-        _C,     _C,     _C,     _C,     _C,     _C,     _C,     _C, 
-        _C,     _C,     _C,     _C,     _C,     _C,     _C,     _C, 
-	_S|_B,	0,	0,	0,	_P,	0,	0,	0, 
-	0,	0,	0,	0,	_P,	_P,	0,	0, 
-	0,	0,	0,	0,	0,	0,	0,	0, 
-	0,	0,	0,	_P,	0,	0,	0,	_P, 
-	0,	_L,	_L,	_L,	_L,	_L,	_L,	_L, 
-	_L,	_L,	_L,	_L,	_L,	_L,	_L,	_L, 
-	0,	_L,	_L,	_L,	_L,	_L,	_L,	_L, 
-	_L,	_L,	_L,	0,	0,	0,	0,	0, 
-	_L,	_L,	_L,	_L,	_L,	_L,	_L,	_L, 
-	_L,	_L,	_L,	_P,	_P,	_P,	_P,	_P, 
-	_P,	_P,	_P,	0,	0,	0,	0,	0, 
-	0,	0,	0,	0,	0,	0,	0,	0 },
-  /* ISO-8859-7 */
-  {	_C,     _C,     _C,     _C,     _C,     _C,     _C,     _C, 
-        _C,     _C,     _C,     _C,     _C,     _C,     _C,     _C, 
-        _C,     _C,     _C,     _C,     _C,     _C,     _C,     _C, 
-        _C,     _C,     _C,     _C,     _C,     _C,     _C,     _C, 
-	_S|_B,	_P,	_P,	_P,	_P,	_P,	_P,	_P, 
-	_P,	_P,	_P,	_P,	_P,	_P,	_P,	_P, 
-	_P,	_P,	_P,	_P,	_P,	_P,	_U,	_P, 
-	_U,	_U,	_U,	_P,	_U,	_P,	_U,	_U, 
-	_L,	_U,	_U,	_U,	_U,	_U,	_U,	_U, 
-	_U,	_U,	_U,	_U,	_U,	_U,	_U,	_U, 
-	_U,	_U,	_U,	_U,	_U,	_U,	_U,	_U, 
-	_U,	_U,	_U,	_U,	_L,	_L,	_L,	_L, 
-	_L,	_L,	_L,	_L,	_L,	_L,	_L,	_L, 
-	_L,	_L,	_L,	_L,	_L,	_L,	_L,	_L, 
-	_L,	_L,	_L,	_L,	_L,	_L,	_L,	_L, 
-	_L,	_L,	_L,	_L,	_L,	_L,	_L,	_P },
-  /* ISO-8859-8 */
-  {	_C,     _C,     _C,     _C,     _C,     _C,     _C,     _C, 
-        _C,     _C,     _C,     _C,     _C,     _C,     _C,     _C, 
-        _C,     _C,     _C,     _C,     _C,     _C,     _C,     _C, 
-        _C,     _C,     _C,     _C,     _C,     _C,     _C,     _C, 
-	_S|_B,	0,	_P,	_P,	_P,	_P,	_P,	_P, 
-	_P,	_P,	_P,	_P,	_P,	_P,	_P,	_P, 
-	_P,	_P,	_P,	_P,	_P,	_P,	_P,	_P, 
-	_P,	_P,	_P,	_P,	_P,	_P,	_P,	0, 
-	0,	0,	0,	0,	0,	0,	0,	0, 
-	0,	0,	0,	0,	0,	0,	0,	0, 
-	0,	0,	0,	0,	0,	0,	0,	0, 
-	0,	0,	0,	0,	0,	0,	0,	_L, 
-	_L,	_L,	_L,	_L,	_L,	_L,	_L,	_L, 
-	_L,	_L,	_L,	_L,	_L,	_L,	_L,	_L, 
-	_L,	_L,	_L,	_L,	_L,	_L,	_L,	_L, 
-	_L,	_L,	_L,	0,	0,	_P,	_P,	0 },
-  /* ISO-8859-9 */
-  {	_C,     _C,     _C,     _C,     _C,     _C,     _C,     _C, 
-        _C,     _C,     _C,     _C,     _C,     _C,     _C,     _C, 
-        _C,     _C,     _C,     _C,     _C,     _C,     _C,     _C, 
-        _C,     _C,     _C,     _C,     _C,     _C,     _C,     _C, 
-	_S|_B,	_P,	_P,	_P,	_P,	_P,	_P,	_P, 
-	_P,	_P,	_P,	_P,	_P,	_P,	_P,	_P, 
-	_P,	_P,	_P,	_P,	_P,	_P,	_P,	_P, 
-	_P,	_P,	_P,	_P,	_P,	_P,	_P,	_P, 
-	_U,	_U,	_U,	_U,	_U,	_U,	_U,	_U, 
-	_U,	_U,	_U,	_U,	_U,	_U,	_U,	_U, 
-	_U,	_U,	_U,	_U,	_U,	_U,	_U,	_P, 
-	_U,	_U,	_U,	_U,	_U,	_U,	_U,	_L, 
-	_L,	_L,	_L,	_L,	_L,	_L,	_L,	_L, 
-	_L,	_L,	_L,	_L,	_L,	_L,	_L,	_L, 
-	_L,	_L,	_L,	_L,	_L,	_L,	_L,	_P, 
-	_L,	_L,	_L,	_L,	_L,	_L,	_L,	_L },
-  /* ISO-8859-10 */
-  {	_C,     _C,     _C,     _C,     _C,     _C,     _C,     _C, 
-        _C,     _C,     _C,     _C,     _C,     _C,     _C,     _C, 
-        _C,     _C,     _C,     _C,     _C,     _C,     _C,     _C, 
-        _C,     _C,     _C,     _C,     _C,     _C,     _C,     _C, 
-	_S|_B,	_U,	_U,	_U,	_U,	_U,	_U,	_P, 
-	_U,	_U,	_U,	_U,	_U,	_P,	_U,	_U, 
-	_P,	_L,	_L,	_L,	_L,	_L,	_L,	_P, 
-	_L,	_L,	_L,	_L,	_L,	_P,	_L,	_L, 
-	_U,	_U,	_U,	_U,	_U,	_U,	_U,	_U, 
-	_U,	_U,	_U,	_U,	_U,	_U,	_U,	_U, 
-	_U,	_U,	_U,	_U,	_U,	_U,	_U,	_U, 
-	_U,	_U,	_U,	_U,	_U,	_U,	_U,	_L, 
-	_L,	_L,	_L,	_L,	_L,	_L,	_L,	_L, 
-	_L,	_L,	_L,	_L,	_L,	_L,	_L,	_L, 
-	_L,	_L,	_L,	_L,	_L,	_L,	_L,	_L, 
-	_L,	_L,	_L,	_L,	_L,	_L,	_L,	_L },
-  /* ISO-8859-11 */
-  {	_C,     _C,     _C,     _C,     _C,     _C,     _C,     _C, 
-        _C,     _C,     _C,     _C,     _C,     _C,     _C,     _C, 
-        _C,     _C,     _C,     _C,     _C,     _C,     _C,     _C, 
-        _C,     _C,     _C,     _C,     _C,     _C,     _C,     _C, 
-	_S|_B,	_L,	_L,	_L,	_L,	_L,	_L,	_L, 
-	_L,	_L,	_L,	_L,	_L,	_L,	_L,	_L, 
-	_L,	_L,	_L,	_L,	_L,	_L,	_L,	_L, 
-	_L,	_L,	_L,	_L,	_L,	_L,	_L,	_L, 
-	_L,	_L,	_L,	_L,	_L,	_L,	_L,	_L, 
-	_L,	_L,	_L,	_L,	_L,	_L,	_L,	_L, 
-	_L,	_P,	_L,	_L,	_P,	_P,	_P,	_P, 
-	_P,	_P,	_P,	0,	0,	0,	0,	_P, 
-	_L,	_L,	_L,	_L,	_L,	_L,	_L,	_P, 
-	_P,	_P,	_P,	_P,	_P,	_P,	_P,	_L, 
-	_L,	_L,	_L,	_L,	_L,	_L,	_L,	_L, 
-	_L,	_L,	_L,	_L,	0,	0,	0,	0 },
-  /* ISO-8859-13 */
-  {	_C,     _C,     _C,     _C,     _C,     _C,     _C,     _C, 
-        _C,     _C,     _C,     _C,     _C,     _C,     _C,     _C, 
-        _C,     _C,     _C,     _C,     _C,     _C,     _C,     _C, 
-        _C,     _C,     _C,     _C,     _C,     _C,     _C,     _C, 
-	_S|_B,	_P,	_P,	_P,	_P,	_P,	_P,	_P, 
-	_P,	_P,	_U,	_P,	_P,	_P,	_P,	_P, 
-	_P,	_P,	_P,	_P,	_P,	_P,	_P,	_P, 
-	_P,	_P,	_L,	_P,	_P,	_P,	_P,	_P, 
-	_U,	_U,	_U,	_U,	_U,	_U,	_U,	_U, 
-	_U,	_U,	_U,	_U,	_U,	_U,	_U,	_U, 
-	_U,	_U,	_U,	_U,	_U,	_U,	_U,	_P, 
-	_U,	_U,	_U,	_U,	_U,	_U,	_U,	_L, 
-	_L,	_L,	_L,	_L,	_L,	_L,	_L,	_L, 
-	_L,	_L,	_L,	_L,	_L,	_L,	_L,	_L, 
-	_L,	_L,	_L,	_L,	_L,	_L,	_L,	_P, 
-	_L,	_L,	_L,	_L,	_L,	_L,	_L,	_P },
-  /* ISO-8859-14 */
-  {	_C,     _C,     _C,     _C,     _C,     _C,     _C,     _C, 
-        _C,     _C,     _C,     _C,     _C,     _C,     _C,     _C, 
-        _C,     _C,     _C,     _C,     _C,     _C,     _C,     _C, 
-        _C,     _C,     _C,     _C,     _C,     _C,     _C,     _C, 
-	_S|_B,	_U,	_L,	_P,	_U,	_L,	_U,	_P, 
-	_U,	_P,	_U,	_L,	_U,	_P,	_P,	_U, 
-	_U,	_L,	_U,	_L,	_U,	_L,	_P,	_U, 
-	_L,	_L,	_L,	_U,	_L,	_U,	_L,	_L, 
-	_U,	_U,	_U,	_U,	_U,	_U,	_U,	_U, 
-	_U,	_U,	_U,	_U,	_U,	_U,	_U,	_U, 
-	_U,	_U,	_U,	_U,	_U,	_U,	_U,	_U, 
-	_U,	_U,	_U,	_U,	_U,	_U,	_U,	_L, 
-	_L,	_L,	_L,	_L,	_L,	_L,	_L,	_L, 
-	_L,	_L,	_L,	_L,	_L,	_L,	_L,	_L, 
-	_L,	_L,	_L,	_L,	_L,	_L,	_L,	_L, 
-	_L,	_L,	_L,	_L,	_L,	_L,	_L,	_L },
-  /* ISO-8859-15 */
-  {	_C,     _C,     _C,     _C,     _C,     _C,     _C,     _C, 
-        _C,     _C,     _C,     _C,     _C,     _C,     _C,     _C, 
-        _C,     _C,     _C,     _C,     _C,     _C,     _C,     _C, 
-        _C,     _C,     _C,     _C,     _C,     _C,     _C,     _C, 
-        _S|_B,  _P,     _P,     _P,     _P,     _P,     _P,     _P, 
-        _P,     _P,     _P,     _P,     _P,     _P,     _P,     _P, 
-        _P,     _P,     _P,     _P,     _P,     _P,     _P,     _P, 
-        _P,     _P,     _P,     _P,     _P,     _P,     _P,     _P, 
-        _U,     _U,     _U,     _U,     _U,     _U,     _U,     _U, 
-        _U,     _U,     _U,     _U,     _U,     _U,     _U,     _U, 
-        _U,     _U,     _U,     _U,     _U,     _U,     _U,     _P, 
-        _U,     _U,     _U,     _U,     _U,     _U,     _U,     _L, 
-        _L,     _L,     _L,     _L,     _L,     _L,     _L,     _L, 
-        _L,     _L,     _L,     _L,     _L,     _L,     _L,     _L, 
-        _L,     _L,     _L,     _L,     _L,     _L,     _L,     _P, 
-        _L,     _L,     _L,     _L,     _L,     _L,     _L,     _L },
-  /* ISO-8859-16 */
-  {	_C,     _C,     _C,     _C,     _C,     _C,     _C,     _C, 
-        _C,     _C,     _C,     _C,     _C,     _C,     _C,     _C, 
-        _C,     _C,     _C,     _C,     _C,     _C,     _C,     _C, 
-        _C,     _C,     _C,     _C,     _C,     _C,     _C,     _C, 
-	_S|_B,	_U,	_L,	_U,	_P,	_P,	_U,	_P, 
-	_L,	_P,	_U,	_P,	_U,	_P,	_L,	_U, 
-	_P,	_P,	_U,	_U,	_U,	_P,	_P,	_P, 
-	_L,	_L,	_L,	_P,	_U,	_L,	_U,	_L, 
-	_U,	_U,	_U,	_U,	_U,	_U,	_U,	_U, 
-	_U,	_U,	_U,	_U,	_U,	_U,	_U,	_U, 
-	_U,	_U,	_U,	_U,	_U,	_U,	_U,	_U, 
-	_U,	_U,	_U,	_U,	_U,	_U,	_U,	_L, 
-	_L,	_L,	_L,	_L,	_L,	_L,	_L,	_L, 
-	_L,	_L,	_L,	_L,	_L,	_L,	_L,	_L, 
-	_L,	_L,	_L,	_L,	_L,	_L,	_L,	_L, 
-	_L,	_L,	_L,	_L,	_L,	_L,	_L,	_L }
-};
-static char __ctype_cp[22][128] = {
-  /* CP437 */
-  {	_U,	_L,	_L,	_L,	_L,	_L,	_L,	_L, 
-	_L,	_L,	_L,	_L,	_L,	_L,	_U,	_U, 
-	_U,	_L,	_U,	_L,	_L,	_L,	_L,	_L, 
-	_L,	_U,	_U,	_P,	_P,	_P,	_P,	_P, 
-	_L,	_L,	_L,	_L,	_L,	_L,	_P,	_P, 
-	_P,	_P,	_P,	_P,	_P,	_P,	_P,	_P, 
-	_P,	_P,	_P,	_P,	_P,	_P,	_P,	_P, 
-	_P,	_P,	_P,	_P,	_P,	_P,	_P,	_P, 
-	_P,	_P,	_P,	_P,	_P,	_P,	_P,	_P, 
-	_P,	_P,	_P,	_P,	_P,	_P,	_P,	_P, 
-	_P,	_P,	_P,	_P,	_P,	_P,	_P,	_P, 
-	_P,	_P,	_P,	_P,	_P,	_P,	_P,	_P, 
-	_L,	_L,	_U,	_L,	_U,	_L,	_P,	_L, 
-	_U,	_U,	_U,	_L,	_P,	_L,	_L,	_P, 
-	_P,	_P,	_P,	_P,	_P,	_P,	_P,	_P, 
-	_P,	_P,	_P,	_P,	_P,	_P,	_P,	_S|_B },
-  /* CP720 */
-  {	0,	0,	_L,	_L,	0,	_L,	0,	_L, 
-	_L,	_L,	_L,	_L,	_L,	0,	0,	0, 
-	0,	_P,	_P,	_L,	_P,	_P,	_L,	_L, 
-	_L,	_L,	_L,	_L,	_L,	_L,	_L,	_L, 
-	0,	_L,	_L,	_L,	_L,	_L,	_L,	_L, 
-	_L,	_L,	_L,	_L,	_L,	_L,	_P,	_P, 
-	_P,	_P,	_P,	_P,	_P,	_P,	_P,	_P, 
-	_P,	_P,	_P,	_P,	_P,	_P,	_P,	_P, 
-	_P,	_P,	_P,	_P,	_P,	_P,	_P,	_P, 
-	_P,	_P,	_P,	_P,	_P,	_P,	_P,	_P, 
-	_P,	_P,	_P,	_P,	_P,	_P,	_P,	_P, 
-	_P,	_P,	_P,	_P,	_P,	_P,	_P,	_P, 
-	_L,	_L,	_L,	_L,	_L,	_L,	_L,	_L, 
-	_L,	_L,	_L,	_L,	_L,	_L,	_L,	_L, 
-	_P,	_P,	_P,	_P,	_P,	_P,	_P,	_P, 
-	_P,	_P,	_P,	_P,	_P,	_P,	_P,	_S|_B },
-  /* CP737 */
-  {	_U,	_U,	_U,	_U,	_U,	_U,	_U,	_U, 
-	_U,	_U,	_U,	_U,	_U,	_U,	_U,	_U, 
-	_U,	_U,	_U,	_U,	_U,	_U,	_U,	_U, 
-	_L,	_L,	_L,	_L,	_L,	_L,	_L,	_L, 
-	_L,	_L,	_L,	_L,	_L,	_L,	_L,	_L, 
-	_L,	_L,	_L,	_L,	_L,	_L,	_L,	_L, 
-	_P,	_P,	_P,	_P,	_P,	_P,	_P,	_P, 
-	_P,	_P,	_P,	_P,	_P,	_P,	_P,	_P, 
-	_P,	_P,	_P,	_P,	_P,	_P,	_P,	_P, 
-	_P,	_P,	_P,	_P,	_P,	_P,	_P,	_P, 
-	_P,	_P,	_P,	_P,	_P,	_P,	_P,	_P, 
-	_P,	_P,	_P,	_P,	_P,	_P,	_P,	_P, 
-	_L,	_L,	_L,	_L,	_L,	_L,	_L,	_L, 
-	_L,	_L,	_U,	_U,	_U,	_U,	_U,	_U, 
-	_U,	_P,	_P,	_P,	_P,	_U,	_U,	_P, 
-	_P,	_P,	_P,	_P,	_P,	_P,	_P,	_S|_B },
-  /* CP775 */
-  {	_U,	_L,	_L,	_L,	_L,	_L,	_L,	_L, 
-	_L,	_L,	_U,	_L,	_L,	_U,	_U,	_U, 
-	_U,	_L,	_U,	_L,	_L,	_U,	_P,	_U, 
-	_L,	_U,	_U,	_P,	_P,	_P,	_P,	_P, 
-	_U,	_U,	_L,	_U,	_L,	_L,	_P,	_P, 
-	_P,	_P,	_P,	_P,	_P,	_U,	_P,	_P, 
-	_P,	_P,	_P,	_P,	_P,	_U,	_U,	_U, 
-	_U,	_P,	_P,	_P,	_P,	_U,	_U,	_P, 
-	_P,	_P,	_P,	_P,	_P,	_P,	_U,	_U, 
-	_P,	_P,	_P,	_P,	_P,	_P,	_P,	_U, 
-	_L,	_L,	_L,	_L,	_L,	_L,	_L,	_L, 
-	_L,	_P,	_P,	_P,	_P,	_P,	_P,	_P, 
-	_U,	_L,	_U,	_U,	_L,	_U,	_L,	_L, 
-	_U,	_L,	_U,	_L,	_L,	_U,	_U,	_P, 
-	_P,	_P,	_P,	_P,	_P,	_P,	_P,	_P, 
-	_P,	_P,	_P,	_P,	_P,	_P,	_P,	_S|_B },
-  /* CP850 */
-  {	_U,	_L,	_L,	_L,	_L,	_L,	_L,	_L, 
-	_L,	_L,	_L,	_L,	_L,	_L,	_U,	_U, 
-	_U,	_L,	_U,	_L,	_L,	_L,	_L,	_L, 
-	_L,	_U,	_U,	_L,	_P,	_U,	_P,	_P, 
-	_L,	_L,	_L,	_L,	_L,	_U,	_P,	_P, 
-	_P,	_P,	_P,	_P,	_P,	_P,	_P,	_P, 
-	_P,	_P,	_P,	_P,	_P,	_U,	_U,	_U, 
-	_P,	_P,	_P,	_P,	_P,	_P,	_P,	_P, 
-	_P,	_P,	_P,	_P,	_P,	_P,	_L,	_U, 
-	_P,	_P,	_P,	_P,	_P,	_P,	_P,	_P, 
-	_L,	_U,	_U,	_U,	_U,	_L,	_U,	_U, 
-	_U,	_P,	_P,	_P,	_P,	_P,	_U,	_P, 
-	_U,	_L,	_U,	_U,	_L,	_U,	_L,	_U, 
-	_L,	_U,	_U,	_U,	_L,	_U,	_P,	_P, 
-	_P,	_P,	_P,	_P,	_P,	_P,	_P,	_P, 
-	_P,	_P,	_P,	_P,	_P,	_P,	_P,	_S|_B },
-  /* CP852 */
-  {	_U,	_L,	_L,	_L,	_L,	_L,	_L,	_L, 
-	_L,	_L,	_U,	_L,	_L,	_U,	_U,	_U, 
-	_U,	_U,	_L,	_L,	_L,	_U,	_L,	_U, 
-	_L,	_U,	_U,	_U,	_L,	_U,	_P,	_L, 
-	_L,	_L,	_L,	_L,	_U,	_L,	_U,	_L, 
-	_U,	_L,	_P,	_L,	_U,	_L,	_P,	_P, 
-	_P,	_P,	_P,	_P,	_P,	_U,	_U,	_U, 
-	_U,	_P,	_P,	_P,	_P,	_U,	_L,	_P, 
-	_P,	_P,	_P,	_P,	_P,	_P,	_U,	_L, 
-	_P,	_P,	_P,	_P,	_P,	_P,	_P,	_P, 
-	_L,	_U,	_U,	_U,	_L,	_U,	_U,	_U, 
-	_L,	_P,	_P,	_P,	_P,	_U,	_U,	_P, 
-	_U,	_L,	_U,	_U,	_L,	_L,	_U,	_L, 
-	_U,	_U,	_L,	_U,	_L,	_U,	_L,	_P, 
-	_P,	_P,	_P,	_P,	_P,	_P,	_P,	_P, 
-	_P,	_P,	_P,	_L,	_U,	_L,	_P,	_S|_B },
-  /* CP855 */
-  {	_L,	_U,	_L,	_U,	_L,	_U,	_L,	_U, 
-	_L,	_U,	_L,	_U,	_L,	_U,	_L,	_U, 
-	_L,	_U,	_L,	_U,	_L,	_U,	_L,	_U, 
-	_L,	_U,	_L,	_U,	_L,	_U,	_L,	_U, 
-	_L,	_U,	_L,	_U,	_L,	_U,	_L,	_U, 
-	_L,	_U,	_L,	_U,	_L,	_U,	_P,	_P, 
-	_P,	_P,	_P,	_P,	_P,	_L,	_U,	_L, 
-	_U,	_P,	_P,	_P,	_P,	_L,	_U,	_P, 
-	_P,	_P,	_P,	_P,	_P,	_P,	_L,	_U, 
-	_P,	_P,	_P,	_P,	_P,	_P,	_P,	_P, 
-	_L,	_U,	_L,	_U,	_L,	_U,	_L,	_U, 
-	_L,	_P,	_P,	_P,	_P,	_U,	_L,	_P, 
-	_U,	_L,	_U,	_L,	_U,	_L,	_U,	_L, 
-	_U,	_L,	_U,	_L,	_U,	_L,	_U,	_P, 
-	_P,	_L,	_U,	_L,	_U,	_L,	_U,	_L, 
-	_U,	_L,	_U,	_L,	_U,	_P,	_P,	_S|_B },
-  /* CP857 */
-  {	_U,	_L,	_L,	_L,	_L,	_L,	_L,	_L, 
-	_L,	_L,	_L,	_L,	_L,	_L,	_U,	_U, 
-	_U,	_L,	_U,	_L,	_L,	_L,	_L,	_L, 
-	_U,	_U,	_U,	_L,	_P,	_U,	_U,	_L, 
-	_L,	_L,	_L,	_L,	_L,	_U,	_U,	_L, 
-	_P,	_P,	_P,	_P,	_P,	_P,	_P,	_P, 
-	_P,	_P,	_P,	_P,	_U,	_U,	_U,	_P, 
-	_P,	_P,	_P,	_P,	_P,	_P,	_P,	_P, 
-	_P,	_P,	_P,	_P,	_P,	_P,	_L,	_U, 
-	_P,	_P,	_P,	_P,	_P,	_P,	_P,	_P, 
-	_P,	_P,	_U,	_U,	_U,	_L,	_U,	_U, 
-	_U,	_P,	_P,	_P,	_P,	_P,	_U,	_P, 
-	_U,	_L,	_U,	_U,	_L,	_U,	_L,	_L, 
-	_P,	_U,	_U,	_U,	_L,	_L,	_P,	_P, 
-	_P,	_P,	_L,	_P,	_P,	_P,	_P,	_P, 
-	_P,	_P,	_P,	_P,	_P,	_P,	_P,	_S|_B },
-  /* CP858 */
-  {	_U,	_L,	_L,	_L,	_L,	_L,	_L,	_L, 
-	_L,	_L,	_L,	_L,	_L,	_L,	_U,	_U, 
-	_U,	_L,	_U,	_L,	_L,	_L,	_L,	_L, 
-	_L,	_U,	_U,	_L,	_P,	_U,	_P,	_P, 
-	_L,	_L,	_L,	_L,	_L,	_U,	_P,	_P, 
-	_P,	_P,	_P,	_P,	_P,	_P,	_P,	_P, 
-	_P,	_P,	_P,	_P,	_P,	_U,	_U,	_U, 
-	_P,	_P,	_P,	_P,	_P,	_P,	_P,	_P, 
-	_P,	_P,	_P,	_P,	_P,	_P,	_L,	_U, 
-	_P,	_P,	_P,	_P,	_P,	_P,	_P,	_P, 
-	_L,	_U,	_U,	_U,	_U,	_P,	_U,	_U, 
-	_U,	_P,	_P,	_P,	_P,	_P,	_U,	_P, 
-	_U,	_L,	_U,	_U,	_L,	_U,	_L,	_U, 
-	_L,	_U,	_U,	_U,	_L,	_U,	_P,	_P, 
-	_P,	_P,	_P,	_P,	_P,	_P,	_P,	_P, 
-	_P,	_P,	_P,	_P,	_P,	_P,	_P,	_S|_B },
-  /* CP862 */
-  {	_L,	_L,	_L,	_L,	_L,	_L,	_L,	_L, 
-	_L,	_L,	_L,	_L,	_L,	_L,	_L,	_L, 
-	_L,	_L,	_L,	_L,	_L,	_L,	_L,	_L, 
-	_L,	_L,	_L,	_P,	_P,	_P,	_P,	_P, 
-	_L,	_L,	_L,	_L,	_L,	_U,	_P,	_P, 
-	_P,	_P,	_P,	_P,	_P,	_P,	_P,	_P, 
-	_P,	_P,	_P,	_P,	_P,	_P,	_P,	_P, 
-	_P,	_P,	_P,	_P,	_P,	_P,	_P,	_P, 
-	_P,	_P,	_P,	_P,	_P,	_P,	_P,	_P, 
-	_P,	_P,	_P,	_P,	_P,	_P,	_P,	_P, 
-	_P,	_P,	_P,	_P,	_P,	_P,	_P,	_P, 
-	_P,	_P,	_P,	_P,	_P,	_P,	_P,	_P, 
-	_L,	_L,	_U,	_L,	_U,	_L,	_P,	_L, 
-	_U,	_U,	_U,	_L,	_P,	_L,	_L,	_P, 
-	_P,	_P,	_P,	_P,	_P,	_P,	_P,	_P, 
-	_P,	_P,	_P,	_P,	_P,	_P,	_P,	_S|_B },
-  /* CP866 */
-  {	_U,	_U,	_U,	_U,	_U,	_U,	_U,	_U, 
-	_U,	_U,	_U,	_U,	_U,	_U,	_U,	_U, 
-	_U,	_U,	_U,	_U,	_U,	_U,	_U,	_U, 
-	_U,	_U,	_U,	_U,	_U,	_U,	_U,	_U, 
-	_L,	_L,	_L,	_L,	_L,	_L,	_L,	_L, 
-	_L,	_L,	_L,	_L,	_L,	_L,	_L,	_L, 
-	_P,	_P,	_P,	_P,	_P,	_P,	_P,	_P, 
-	_P,	_P,	_P,	_P,	_P,	_P,	_P,	_P, 
-	_P,	_P,	_P,	_P,	_P,	_P,	_P,	_P, 
-	_P,	_P,	_P,	_P,	_P,	_P,	_P,	_P, 
-	_P,	_P,	_P,	_P,	_P,	_P,	_P,	_P, 
-	_P,	_P,	_P,	_P,	_P,	_P,	_P,	_P, 
-	_L,	_L,	_L,	_L,	_L,	_L,	_L,	_L, 
-	_L,	_L,	_L,	_L,	_L,	_L,	_L,	_L, 
-	_U,	_L,	_U,	_L,	_U,	_L,	_U,	_L, 
-	_P,	_P,	_P,	_P,	_P,	_P,	_P,	_S|_B },
-  /* CP874 */
-  {	_P,	0,	0,	0,	0,	_P,	0,	0, 
-	0,	0,	0,	0,	0,	0,	0,	0, 
-	0,	_P,	_P,	_P,	_P,	_P,	_P,	_P, 
-	0,	0,	0,	0,	0,	0,	0,	0, 
-	_S|_B,	_L,	_L,	_L,	_L,	_L,	_L,	_L, 
-	_L,	_L,	_L,	_L,	_L,	_L,	_L,	_L, 
-	_L,	_L,	_L,	_L,	_L,	_L,	_L,	_L, 
-	_L,	_L,	_L,	_L,	_L,	_L,	_L,	_L, 
-	_L,	_L,	_L,	_L,	_L,	_L,	_L,	_L, 
-	_L,	_L,	_L,	_L,	_L,	_L,	_L,	_L, 
-	_L,	_L,	_L,	_L,	_L,	_L,	_L,	_L, 
-	_L,	_L,	_L,	0,	0,	0,	0,	_P, 
-	_L,	_L,	_L,	_L,	_L,	_L,	_L,	_L, 
-	_L,	_L,	_L,	_L,	_L,	_L,	_L,	_L, 
-	_P,	_P,	_P,	_P,	_P,	_P,	_P,	_P, 
-	_P,	_P,	_L,	_L,	0,	0,	0,	0 },
-  /* CP1125 */
-  {	_U,	_U,	_U,	_U,	_U,	_U,	_U,	_U, 
-	_U,	_U,	_U,	_U,	_U,	_U,	_U,	_U, 
-	_U,	_U,	_U,	_U,	_U,	_U,	_U,	_U, 
-	_U,	_U,	_U,	_U,	_U,	_U,	_U,	_U, 
-	_L,	_L,	_L,	_L,	_L,	_L,	_L,	_L, 
-	_L,	_L,	_L,	_L,	_L,	_L,	_L,	_L, 
-	_P,	_P,	_P,	_P,	_P,	_P,	_P,	_P, 
-	_P,	_P,	_P,	_P,	_P,	_P,	_P,	_P, 
-	_P,	_P,	_P,	_P,	_P,	_P,	_P,	_P, 
-	_P,	_P,	_P,	_P,	_P,	_P,	_P,	_P, 
-	_P,	_P,	_P,	_P,	_P,	_P,	_P,	_P, 
-	_P,	_P,	_P,	_P,	_P,	_P,	_P,	_P, 
-	_L,	_L,	_L,	_L,	_L,	_L,	_L,	_L, 
-	_L,	_L,	_L,	_L,	_L,	_L,	_L,	_L, 
-	_U,	_L,	_U,	_L,	_U,	_L,	_U,	_L, 
-	_U,	_L,	_P,	_P,	_P,	_P,	_P,	_S|_B },
-  /* CP1250 */
-  {	_P,	0,	_P,	0,	_P,	_P,	_P,	_P, 
-	0,	_P,	_U,	_P,	_U,	_U,	_U,	_U, 
-	0,	_P,	_P,	_P,	_P,	_P,	_P,	_P, 
-	0,	_P,	_L,	_P,	_L,	_L,	_L,	_L, 
-	_S|_B,	_P,	_P,	_U,	_P,	_U,	_P,	_P, 
-	_P,	_P,	_U,	_P,	_P,	_P,	_P,	_U, 
-	_P,	_P,	_P,	_L,	_P,	_P,	_P,	_P, 
-	_P,	_L,	_L,	_P,	_U,	_P,	_L,	_L, 
-	_U,	_U,	_U,	_U,	_U,	_U,	_U,	_U, 
-	_U,	_U,	_U,	_U,	_U,	_U,	_U,	_U, 
-	_U,	_U,	_U,	_U,	_U,	_U,	_U,	_P, 
-	_U,	_U,	_U,	_U,	_U,	_U,	_U,	_L, 
-	_L,	_L,	_L,	_L,	_L,	_L,	_L,	_L, 
-	_L,	_L,	_L,	_L,	_L,	_L,	_L,	_L, 
-	_L,	_L,	_L,	_L,	_L,	_L,	_L,	_P, 
-	_L,	_L,	_L,	_L,	_L,	_L,	_L,	_P },
-  /* CP1251 */
-  {	_U,	_U,	_P,	_L,	_P,	_P,	_P,	_P, 
-	_P,	_P,	_U,	_P,	_U,	_U,	_U,	_U, 
-	_L,	_P,	_P,	_P,	_P,	_P,	_P,	_P, 
-	_L,	_P,	_L,	_L,	_L,	_L,	_P,	_U, 
-	_S|_B,	_U,	_L,	_U,	_P,	_U,	_P,	_P, 
-	_U,	_P,	_U,	_P,	_P,	_P,	_P,	_U, 
-	_P,	_P,	_U,	_L,	_L,	_P,	_P,	_P, 
-	_L,	_P,	_L,	_P,	_L,	_U,	_L,	_L, 
-	_U,	_U,	_U,	_U,	_U,	_U,	_U,	_U, 
-	_U,	_U,	_U,	_U,	_U,	_U,	_U,	_U, 
-	_U,	_U,	_U,	_U,	_U,	_U,	_U,	_U, 
-	_U,	_U,	_U,	_U,	_U,	_U,	_U,	_U, 
-	_L,	_L,	_L,	_L,	_L,	_L,	_L,	_L, 
-	_L,	_L,	_L,	_L,	_L,	_L,	_L,	_L, 
-	_L,	_L,	_L,	_L,	_L,	_L,	_L,	_L, 
-	_L,	_L,	_L,	_L,	_L,	_L,	_L,	_L },
-  /* CP1252 */
-  {	_P,	0,	_P,	_L,	_P,	_P,	_P,	_P, 
-	_P,	_P,	_U,	_P,	_U,	_U,	0,	0, 
-	0,	_P,	_P,	_P,	_P,	_P,	_P,	_P, 
-	_P,	_P,	_L,	_P,	_L,	0,	_L,	_U, 
-	_S|_B,	_P,	_P,	_P,	_P,	_P,	_P,	_P, 
-	_P,	_P,	_P,	_P,	_P,	_P,	_P,	_P, 
-	_P,	_P,	_P,	_P,	_P,	_P,	_P,	_P, 
-	_P,	_P,	_P,	_P,	_P,	_P,	_P,	_P, 
-	_U,	_U,	_U,	_U,	_U,	_U,	_U,	_U, 
-	_U,	_U,	_U,	_U,	_U,	_U,	_U,	_U, 
-	_U,	_U,	_U,	_U,	_U,	_U,	_U,	_P, 
-	_U,	_U,	_U,	_U,	_U,	_U,	_U,	_L, 
-	_L,	_L,	_L,	_L,	_L,	_L,	_L,	_L, 
-	_L,	_L,	_L,	_L,	_L,	_L,	_L,	_L, 
-	_L,	_L,	_L,	_L,	_L,	_L,	_L,	_P, 
-	_L,	_L,	_L,	_L,	_L,	_L,	_L,	_L },
-  /* CP1253 */
-  {	_P,	0,	_P,	_L,	_P,	_P,	_P,	_P, 
-	0,	_P,	0,	_P,	0,	0,	0,	0, 
-	0,	_P,	_P,	_P,	_P,	_P,	_P,	_P, 
-	0,	_P,	_P,	0,	0,	0,	0,	0, 
-	_S|_B,	_P,	_U,	_P,	_P,	_P,	_P,	_P, 
-	_P,	_P,	0,	_P,	_P,	_P,	_P,	_P, 
-	_P,	_P,	_P,	_P,	_P,	_P,	_P,	_P, 
-	_U,	_U,	_U,	_P,	_U,	_P,	_U,	_U, 
-	_L,	_U,	_U,	_U,	_U,	_U,	_U,	_U, 
-	_U,	_U,	_U,	_U,	_U,	_U,	_U,	_U, 
-	_U,	_U,	_U,	_U,	_U,	_U,	_U,	_U, 
-	_U,	_U,	_U,	_U,	_L,	_L,	_L,	_L, 
-	_L,	_L,	_L,	_L,	_L,	_L,	_L,	_L, 
-	_L,	_L,	_L,	_L,	_L,	_L,	_L,	_L, 
-	_L,	_L,	_L,	_L,	_L,	_L,	_L,	_L, 
-	_L,	_L,	_L,	_L,	_L,	_L,	_L,	_L },
-  /* CP1254 */
-  {	_P,	0,	_P,	_L,	_P,	_P,	_P,	_P, 
-	_P,	_P,	_U,	_P,	_U,	0,	0,	0, 
-	0,	_P,	_P,	_P,	_P,	_P,	_P,	_P, 
-	_P,	_P,	_L,	_P,	_L,	0,	0,	_U, 
-	_S|_B,	_P,	_P,	_P,	_P,	_P,	_P,	_P, 
-	_P,	_P,	_P,	_P,	_P,	_P,	_P,	_P, 
-	_P,	_P,	_P,	_P,	_P,	_P,	_P,	_P, 
-	_P,	_P,	_P,	_P,	_P,	_P,	_P,	_P, 
-	_U,	_U,	_U,	_U,	_U,	_U,	_U,	_U, 
-	_U,	_U,	_U,	_U,	_U,	_U,	_U,	_U, 
-	_U,	_U,	_U,	_U,	_U,	_U,	_U,	_P, 
-	_U,	_U,	_U,	_U,	_U,	_U,	_U,	_L, 
-	_L,	_L,	_L,	_L,	_L,	_L,	_L,	_L, 
-	_L,	_L,	_L,	_L,	_L,	_L,	_L,	_L, 
-	_L,	_L,	_L,	_L,	_L,	_L,	_L,	_P, 
-	_L,	_L,	_L,	_L,	_L,	_L,	_L,	_L },
-  /* CP1255 */
-  {	_P,	0,	_P,	_L,	_P,	_P,	_P,	_P, 
-	_P,	_P,	0,	_P,	0,	0,	0,	0, 
-	0,	_P,	_P,	_P,	_P,	_P,	_P,	_P, 
-	_P,	_P,	0,	_P,	0,	0,	0,	0, 
-	_S|_B,	_P,	_P,	_P,	_P,	_P,	_P,	_P, 
-	_P,	_P,	_P,	_P,	_P,	_P,	_P,	_P, 
-	_P,	_P,	_P,	_P,	_P,	_P,	_P,	_P, 
-	_P,	_P,	_P,	_P,	_P,	_P,	_P,	_P, 
-	_P,	_P,	_P,	_P,	_P,	_P,	_P,	_P, 
-	_P,	_P,	_P,	_P,	_P,	_P,	_P,	_P, 
-	_P,	_P,	_P,	_P,	_P,	_P,	_P,	_P, 
-	_P,	0,	0,	0,	0,	0,	0,	0, 
-	_L,	_L,	_L,	_L,	_L,	_L,	_L,	_L, 
-	_L,	_L,	_L,	_L,	_L,	_L,	_L,	_L, 
-	_L,	_L,	_L,	_L,	_L,	_L,	_L,	_L,
-	_L,	_L,	_L,	0,	0,	_P,	_P,	0 },
-  /* CP1256 */
-  {	_P,	_L,	_P,	_L,	_P,	_P,	_P,	_P, 
-	_P,	_P,	_L,	_P,	_U,	_L,	_L,	_L, 
-	_L,	_P,	_P,	_P,	_P,	_P,	_P,	_P, 
-	_L,	_P,	_L,	_P,	_L,	_P,	_P,	_L, 
-	_S|_B,	_P,	_P,	_P,	_P,	_P,	_P,	_P, 
-	_P,	_P,	_L,	_P,	_P,	_P,	_P,	_P, 
-	_P,	_P,	_P,	_P,	_P,	_P,	_P,	_P, 
-	_P,	_P,	_P,	_P,	_P,	_P,	_P,	_P, 
-	_L,	_L,	_L,	_L,	_L,	_L,	_L,	_L, 
-	_L,	_L,	_L,	_L,	_L,	_L,	_L,	_L, 
-	_L,	_L,	_L,	_L,	_L,	_L,	_L,	_P, 
-	_L,	_L,	_L,	_L,	_P,	_L,	_L,	_L, 
-	_L,	_L,	_L,	_L,	_L,	_L,	_L,	_L, 
-	_L,	_L,	_L,	_L,	_L,	_L,	_L,	_L,
-	_P,	_P,	_P,	_P,	_L,	_P,	_P,	_P, 
-	_P,	_L,	_P,	_L,	_L,	_P,	_P,	_L },
-  /* CP1257 */
-  {	_P,	0,	_P,	0,	_P,	_P,	_P,	_P, 
-	0,	_P,	0,	_P,	0,	_P,	_P,	_P, 
-	0,	_P,	_P,	_P,	_P,	_P,	_P,	_P, 
-	0,	_P,	0,	_P,	0,	_P,	_P,	0, 
-	_S|_B,	0,	_P,	_P,	_P,	0,	_P,	_P, 
-	_U,	_P,	_U,	_P,	_P,	_P,	_P,	_U, 
-	_P,	_P,	_P,	_P,	_P,	_P,	_P,	_P, 
-	_L,	_P,	_L,	_P,	_P,	_P,	_P,	_L, 
-	_U,	_U,	_U,	_U,	_U,	_U,	_U,	_U, 
-	_U,	_U,	_U,	_U,	_U,	_U,	_U,	_U, 
-	_U,	_U,	_U,	_U,	_U,	_U,	_U,	_P, 
-	_U,	_U,	_U,	_U,	_U,	_U,	_U,	_L, 
-	_L,	_L,	_L,	_L,	_L,	_L,	_L,	_L,
-	_L,	_L,	_L,	_L,	_L,	_L,	_L,	_L, 
-	_L,	_L,	_L,	_L,	_L,	_L,	_L,	_P, 
-	_L,	_L,	_L,	_L,	_L,	_L,	_L,	_P },
-  /* CP1258 */
-  {	_P,	0,	_P,	_L,	_P,	_P,	_P,	_P, 
-	_P,	_P,	0,	_P,	_U,	0,	0,	0, 
-	0,	_P,	_P,	_P,	_P,	_P,	_P,	_P, 
-	_P,	_P,	0,	_P,	_L,	0,	0,	_U, 
-	_S|_B,	_P,	_P,	_P,	_P,	_P,	_P,	_P, 
-	_P,	_P,	_P,	_P,	_P,	_P,	_P,	_P, 
-	_P,	_P,	_P,	_P,	_P,	_P,	_P,	_P, 
-	_P,	_P,	_P,	_P,	_P,	_P,	_P,	_P, 
-	_U,	_U,	_U,	_U,	_U,	_U,	_U,	_U, 
-	_U,	_U,	_U,	_U,	_P,	_U,	_U,	_U, 
-	_U,	_U,	_P,	_U,	_U,	_U,	_U,	_P, 
-	_U,	_U,	_U,	_U,	_U,	_U,	_P,	_L,
-	_L,	_L,	_L,	_L,	_L,	_L,	_L,	_L, 
-	_L,	_L,	_L,	_L,	_P,	_L,	_L,	_L, 
-	_L,	_L,	_P,	_L,	_L,	_L,	_L,	_P, 
-	_L,	_L,	_L,	_L,	_L,	_L,	_P,	_L }
-};
-
-char ctype_b[128 + 256] = {
-	_CTYPE_DATA_128_256,
-	_CTYPE_DATA_0_127,
-	_CTYPE_DATA_128_256
-};
-
-__asm__ ("					\n\
-	.data					\n\
-	.globl	__ctype_			\n\
-	.set    __ctype_,_ctype_b+127		\n\
-	.text					\n\
-");
-
-#define makefunc(x) \
-  static int __cdecl \
-  c_##x (int c) \
-  { \
-    return x (c); \
-  } \
-  EXPORT_ALIAS(c_##x, x)
-
-makefunc(isalnum)
-makefunc(isalpha)
-makefunc(iscntrl)
-makefunc(isdigit)
-makefunc(isgraph)
-makefunc(islower)
-makefunc(isprint)
-makefunc(ispunct)
-makefunc(isspace)
-makefunc(isupper)
-makefunc(isxdigit)
-makefunc(isblank)
-makefunc(isascii)
-makefunc(toascii)
-
-static int __cdecl
-c_tolower (int c)
-{
-  if ((unsigned char) c <= 0x7f)
-    return isupper (c) ? c + 0x20 : c;
-
-  char s[8] = { c, '\0' };
-  wchar_t wc;
-  if (mbtowc (&wc, s, 1) >= 0
-      && wctomb (s, (wchar_t) towlower ((wint_t) wc)) == 1)
-    c = s[0];
-  return c;
-}
-EXPORT_ALIAS(c_tolower, tolower)
-
-static int __cdecl
-c_toupper (int c)
-{
-  if ((unsigned char) c <= 0x7f)
-    return islower (c) ? c - 0x20 : c;
-
-  char s[8] = { c, '\0' };
-  wchar_t wc;
-  if (mbtowc (&wc, s, 1) >= 0
-      && wctomb (s, (wchar_t) towupper ((wint_t) wc)) == 1)
-    c = s[0];
-  return c;
-}
-EXPORT_ALIAS(c_toupper, toupper)
+extern char _ctype_b[128 + 256];
 
 /* Called from newlib's setlocale().  What we do here is to copy the
    128 bytes of charset specific ctype data into the array at _ctype_b.
@@ -750,8 +12,10 @@ EXPORT_ALIAS(c_toupper, toupper)
    application, that's the only backward compatible way to do it.
    Setlocale is usually only called once in an application, so this isn't
    time-critical anyway. */
-int __iso_8859_index (const char *charset_ext);	/* Newlib */
-int __cp_index (const char *charset_ext);	/* Newlib */
+extern int __iso_8859_index (const char *charset_ext);	/* Newlib */
+extern int __cp_index (const char *charset_ext);	/* Newlib */
+extern const char __ctype_cp[22][128 + 256];		/* Newlib */
+extern const char __ctype_iso[15][128 + 256];		/* Newlib */
 
 void
 __set_ctype (const char *charset)
@@ -767,21 +31,33 @@ __set_ctype (const char *charset)
       	idx = 0;
       else
 	++idx;
-      memcpy (ctype_b, __ctype_iso[idx], 128);
-      memcpy (ctype_b + 256, __ctype_iso[idx], 128);
+      if (CYGWIN_VERSION_CHECK_FOR_OLD_CTYPE)
+      	{
+	  memcpy (_ctype_b, __ctype_iso[idx], 128);
+	  memcpy (_ctype_b + 256, __ctype_iso[idx], 128);
+	}
+      __ctype_ptr__ = (char *) (__ctype_iso[idx] + 127);
       return;
     case 'C':
       idx = __cp_index (charset + 2);
       if (idx < 0)
 	break;
-      memcpy (ctype_b, __ctype_cp[idx], 128);
-      memcpy (ctype_b + 256, __ctype_cp[idx], 128);
+      if (CYGWIN_VERSION_CHECK_FOR_OLD_CTYPE)
+	{
+	  memcpy (_ctype_b, __ctype_cp[idx], 128);
+	  memcpy (_ctype_b + 256, __ctype_cp[idx], 128);
+	}
+      __ctype_ptr__ = (char *) (__ctype_cp[idx] + 127);
       return;
     default:
       break;
     }
-  memcpy (ctype_b, __ctype_default, 128);
-  memcpy (ctype_b + 256, __ctype_default, 128);
+  if (CYGWIN_VERSION_CHECK_FOR_OLD_CTYPE)
+    {
+      memset (_ctype_b, 0, 128);
+      memset (_ctype_b + 256, 0, 128);
+    }
+  __ctype_ptr__ = (char *) _ctype_b + 127;
 }
 
 } /* extern "C" */
diff --git a/winsup/cygwin/cygwin.din b/winsup/cygwin/cygwin.din
index 0a22e69c1..8ccafd415 100644
--- a/winsup/cygwin/cygwin.din
+++ b/winsup/cygwin/cygwin.din
@@ -6,6 +6,7 @@ __argv DATA
 _check_for_executable DATA
 __check_rhosts_file DATA
 _ctype_ DATA
+__ctype_ptr__ DATA
 __cygwin_environ DATA
 __cygwin_user_data DATA
 _daylight DATA
diff --git a/winsup/cygwin/include/ctype.h b/winsup/cygwin/include/ctype.h
deleted file mode 100644
index f3341822b..000000000
--- a/winsup/cygwin/include/ctype.h
+++ /dev/null
@@ -1,73 +0,0 @@
-#ifndef _CTYPE_H_
-#define _CTYPE_H_
-
-#include <_ansi.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-int __cdecl isalnum(int);
-int __cdecl isalpha(int);
-int __cdecl iscntrl(int);
-int __cdecl isdigit(int);
-int __cdecl isgraph(int);
-int __cdecl islower(int);
-int __cdecl isprint(int);
-int __cdecl ispunct(int);
-int __cdecl isspace(int);
-int __cdecl isupper(int);
-int __cdecl isxdigit(int);
-int __cdecl tolower(int);
-int __cdecl toupper(int);
-
-#ifndef __STRICT_ANSI__
-int __cdecl isblank(int);
-int __cdecl isascii(int);
-int __cdecl toascii(int);
-int __cdecl _tolower(int);
-int __cdecl _toupper(int);
-#endif
-
-#define	_U	01
-#define	_L	02
-#define	_N	04
-#define	_S	010
-#define _P	020
-#define _C	040
-#define _X	0100
-#define	_B	0200
-
-#if defined (__INSIDE_CYGWIN__) || defined (_COMPILING_NEWLIB)
-extern const char _ctype_[];
-#ifdef _COMPILING_NEWLIB
-extern const char *__ctype_ptr__;
-#endif
-#else
-extern const __declspec(dllimport) char _ctype_[];
-#endif
-
-#if !defined(__cplusplus) || defined(__INSIDE_CYGWIN__)
-#define	isalpha(c)	((_ctype_+1)[(unsigned)(c)]&(_U|_L))
-#define isblank(c)	((_ctype_+1)[(unsigned)(c)]&_B)
-#define	isupper(c)	((_ctype_+1)[(unsigned)(c)]&_U)
-#define	islower(c)	((_ctype_+1)[(unsigned)(c)]&_L)
-#define	isdigit(c)	((_ctype_+1)[(unsigned)(c)]&_N)
-#define	isxdigit(c)	((_ctype_+1)[(unsigned)(c)]&(_X|_N))
-#define	isspace(c)	((_ctype_+1)[(unsigned)(c)]&_S)
-#define ispunct(c)	((_ctype_+1)[(unsigned)(c)]&_P)
-#define isalnum(c)	((_ctype_+1)[(unsigned)(c)]&(_U|_L|_N))
-#define isprint(c)	((_ctype_+1)[(unsigned)(c)]&(_P|_U|_L|_N|_B))
-#define	isgraph(c)	((_ctype_+1)[(unsigned)(c)]&(_P|_U|_L|_N))
-#define iscntrl(c)	((_ctype_+1)[(unsigned)(c)]&_C)
-#endif /* !__cplusplus */
-
-#if !defined(__STRICT_ANSI__) || defined(__INSIDE_CYGWIN__)
-#define isascii(c)	((unsigned)(c)<=0177)
-#define toascii(c)	((c)&0177)
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* _CTYPE_H_ */
diff --git a/winsup/cygwin/include/cygwin/config.h b/winsup/cygwin/include/cygwin/config.h
index f887bac15..da82c1dec 100644
--- a/winsup/cygwin/include/cygwin/config.h
+++ b/winsup/cygwin/include/cygwin/config.h
@@ -4,7 +4,7 @@
    sys/config.h before.  This way we can manaage our configuration
    setting without bothering newlib.
 
-   Copyright 2003 Red Hat, Inc.
+   Copyright 2003, 2007, 2008, 2009 Red Hat, Inc.
    Written by C. Vinschen.
 
 This file is part of Cygwin.
@@ -56,8 +56,10 @@ extern char *_tlsbase __asm__ ("%fs:4");
 #define __USE_INTERNAL_STAT64 1
 #endif
 #if defined(__INSIDE_CYGWIN__) || defined(_COMPILING_NEWLIB)
+#define __EXPORT __declspec(dllexport)
 #define __IMPORT
 #else
+#define __EXPORT
 #define __IMPORT __declspec(dllimport)
 #endif
 
diff --git a/winsup/cygwin/include/cygwin/version.h b/winsup/cygwin/include/cygwin/version.h
index d2c527c2d..251010c97 100644
--- a/winsup/cygwin/include/cygwin/version.h
+++ b/winsup/cygwin/include/cygwin/version.h
@@ -95,6 +95,9 @@ details. */
 #define CYGWIN_VERSION_CHECK_FOR_OLD_IFREQ \
   (CYGWIN_VERSION_USER_API_VERSION_COMBINED <= 161)
 
+#define CYGWIN_VERSION_CHECK_FOR_OLD_CTYPE \
+  (CYGWIN_VERSION_USER_API_VERSION_COMBINED <= 209)
+
      /* API_MAJOR 0.0: Initial version.  API_MINOR changes:
 	1: Export cygwin32_ calls as cygwin_ as well.
 	2: Export j1, jn, y1, yn.
@@ -358,12 +361,13 @@ details. */
       207: Export wcsdup.
       208: Export log2, log2f.
       209: Export wordexp, wordfree.
+      210: New ctype layout using variable ctype pointer.  Export __ctype_ptr__.
      */
 
      /* Note that we forgot to bump the api for ualarm, strtoll, strtoull */
 
 #define CYGWIN_VERSION_API_MAJOR 0
-#define CYGWIN_VERSION_API_MINOR 209
+#define CYGWIN_VERSION_API_MINOR 210
 
      /* There is also a compatibity version number associated with the
 	shared memory regions.  It is incremented when incompatible