Thu Mar 28 03:25:10 1996 Roland McGrath <roland@charlie-brown.gnu.ai.mit.edu>

	* intl/Makefile (copysrc): Add missing > in sed cmd.

Sat Mar 23 17:52:49 1996  Ulrich Drepper  <drepper@gnu.ai.mit.edu>

	* Makeconfig: Rename Makefile variable nlsdir to i18ndir and
	change value to $(datadir)/i18n.  `nls' is not an appropriate
	name.

	* Makefile (subdirs): Add new subdir wctype.

	* ctype/ctype-info.c: Add new global variable __ctype_names
	and initialize from _nl_C_LC_CTYPE.

	* ctype/ctype.h: In P1003.3b/D11 `alnum' is a separate character
        class.  Use bit 11.
	[_ISbit]: Protect definition of bitmasks because they are also
	used in wctype.h.

	* libio/genops.c (_IO_sputbackc, _IO_sungetc): Clear EOF flag
	after successfully pushing back a character.

	Fundamental changes in locale implementation.  Almost nothing
	from the old code is used anymore.
	* locale/charmap.c, locale/collate.c, locale/config.h,
 	locale/ctypedump.c, locale/hash.h, locale/keyword.gperf,
 	locale/keyword.h, locale/loadlocale.c, locale/locale-ctype.c,
 	locale/locale.c locale/localeconv.c, locale/localedef.c,
 	locale/localedef.h, locale/locfile-hash.c, locale/locfile-lex.c,
 	locale/locfile-parse.c, locale/messages.c, locale/monetary.c,
 	locale/numeric.c, locale/setlocale.c, locale/token.h,
 	locale/xmalloc.c: Removed.

	* locale/Makefile: Update for new locale implementation with
	program source code distributed in subdir.

	* locale/categories.def, locale/iso-4217.def: Updated file
        for new locale implementation.

	* locale/langinfo.h: Updated for new locale implementation.
	(ERA_D_T_FMT, ERA_T_FMT): New official values according to
	P1003.2b/D11.
	(_NL_COLLATE_NRULES, _NL_COLLATE_RULES, _NL_COLLATE_HASH_SIZE,
	_NL_COLLATE_HASH_LAYERS, _NL_COLLATE_TABLE_EB,
	_NL_COLLATE_TABLE_EL, _NL_COLLATE_UNDEFINED, _NL_COLLATE_EXTRA_EB,
	_NL_COLLATE_EXTRA_EL, _NL_CTYPE_NAMES_EB, _NL_CTYPE_NAMES_EL,
	_NL_CTYPE_HASH_SIZE, _NL_CTYPE_HASH_LAYERS, _NL_CTYPE_CLASS_NAMES,
	_NL_CTYPE_MAP_NAMES, _NL_CTYPE_WIDTH): New internal values for
	extended LC_CTYPE and LC_COLLATE implementation.

	* locale/simple-hash.c, locale/simple-hash.h, locale/xmalloc.c,
 	locale/xstrdup.c: Helper functions for locale related programs.

	* locale/C-collate.c, locale/C-ctype.c,
        locale/C-messages.c, locale/C-monetary.c,
        locale/C-numeric.c, locale/C-time.c,
        locale/lc-collate.c, locale/lc-ctype.c,
        locale/lc-messages.c, locale/lc-monetary.c,
        locale/lc-numeric.c, locale/lc-time.c: New implementation of locale
        functions, and new generated "C" locale data.

	* locale/loadlocale.c: Now handles word fields in locale binary
        automatically by changing the endianess if necessary.

	* locale/localeinfo.h (LIMAGIC): Changed magic number because
	of incompatible changes.
	(locale_data): Changed definition to allow word as a value type.
	(coll_sort_rule): Values for collation sorting mode.
	(_NL_CURRENT_WORD): New macro to access word value of locale entry.
	(__collate_table, __collate_extra): Declare new global variables
	for collation tables.

	* locale/programs/charmap-kw.gperf, locale/programs/charmap-kw.h,
        locale/programs/charmap.c, locale/programs/charset.c,
        locale/programs/charset.h, locale/programs/config.h,
        locale/programs/ctypedump.c, locale/programs/ld-collate.c,
        locale/programs/ld-ctype.c, locale/programs/ld-messages.c,
        locale/programs/ld-monetary.c, locale/programs/ld-numeric.c,
        locale/programs/ld-time.c, locale/programs/linereader.c,
        locale/programs/linereader.h, locale/programs/locale.c,
        locale/programs/localedef.c, locale/programs/locales.h,
        locale/programs/locfile-kw.gperf, locale/programs/locfile-kw.h,
        locale/programs/locfile-token.h, locale/programs/locfile.c,
        locale/programs/locfile.h, locale/programs/stringtrans.c,
        locale/programs/stringtrans.h: Implementation of locale related
        programs.

	* locale/weight.h: Functions to access collation tables.

	* posix/unistd.h: Define _POSIX2_LOCALEDEF.

	* stdio-common/printf_fp.c: Fix bug with printing certain numbers
	< 10^-1.  Reported by Bill Metzenthen.

	* stdio-common/tfformat.c: Add new test for above bug.

	* string/strcoll.c, string/strxfrm.c: Real implementation of
        string collation according to ISO C.

	* wctype/Makefile, wctype/cname-lookup.h, wctype/iswctype.c,
        wctype/test_wctype.c, wctype/towctrans.c, wctype/wcfuncs.c,
        wctype/wctrans.c, wctype/wctype.c, wctype/wctype.h: New files.
        Implementation of wide character classes and mapping.

9 files changed, 607 insertions, 0 deletions

diff --git a/wctype/Makefile b/wctype/Makefile
new file mode 100644
index 0000000000..e0c84c39f1
--- /dev/null
+++ b/wctype/Makefile
@@ -0,0 +1,30 @@
+# Copyright (C) 1996 Free Software Foundation, Inc.
+# This file is part of the GNU C Library.
+
+# The GNU C Library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Library General Public License as
+# published by the Free Software Foundation; either version 2 of the
+# License, or (at your option) any later version.
+
+# The GNU C Library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Library General Public License for more details.
+
+# You should have received a copy of the GNU Library General Public
+# License along with the GNU C Library; see the file COPYING.LIB.  If
+# not, write to the Free Software Foundation, Inc., 675 Mass Ave,
+# Cambridge, MA 02139, USA.
+
+#
+#	Sub-makefile for wctype portion of the library.
+#
+subdir	:= wctype
+
+headers		:= wctype.h
+distribute	:= cname-lookup.h
+routines	:= wcfuncs wctype iswctype wctrans towctrans
+
+tests	:= test_wctype
+
+include ../Rules
diff --git a/wctype/cname-lookup.h b/wctype/cname-lookup.h
new file mode 100644
index 0000000000..bef38a12d3
--- /dev/null
+++ b/wctype/cname-lookup.h
@@ -0,0 +1,45 @@
+/* Copyright (C) 1996 Free Software Foundation, Inc.
+This file is part of the GNU C Library.
+Contributed by Ulrich Drepper, <drepper@gnu.ai.mit.edu>.
+
+The GNU C Library is free software; you can redistribute it and/or
+modify it under the terms of the GNU Library General Public License as
+published by the Free Software Foundation; either version 2 of the
+License, or (at your option) any later version.
+
+The GNU C Library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+Library General Public License for more details.
+
+You should have received a copy of the GNU Library General Public
+License along with the GNU C Library; see the file COPYING.LIB.  If
+not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
+
+#include "localeinfo.h"
+
+/* Some words on the runtime of this functions.  Although there is a
+   loop in the function the runtime is asymptotically quasi constant.
+   The reason is that even for the largest character sets HASH_LAYERS
+   will not grow beyond 15 (a guess!).  */
+static __inline size_t
+cname_lookup (wint_t wc)
+{
+  extern unsigned int *__ctype_names;
+  unsigned int hash_size, hash_layers;
+  size_t result, cnt;
+
+  hash_size = _NL_CURRENT_WORD (LC_CTYPE, _NL_CTYPE_HASH_SIZE);
+  hash_layers = _NL_CURRENT_WORD (LC_CTYPE, _NL_CTYPE_HASH_LAYERS);
+
+  result = wc % hash_size;
+  for (cnt = 0; cnt < hash_layers; ++cnt)
+    {
+      if (__ctype_names[result] == wc)
+	break;
+      result += hash_size;
+    }
+
+  return cnt < hash_layers ? result : ~((size_t) 0);
+}
diff --git a/wctype/iswctype.c b/wctype/iswctype.c
new file mode 100644
index 0000000000..041548b2dc
--- /dev/null
+++ b/wctype/iswctype.c
@@ -0,0 +1,39 @@
+/* Copyright (C) 1996 Free Software Foundation, Inc.
+This file is part of the GNU C Library.
+Contributed by Ulrich Drepper, <drepper@gnu.ai.mit.edu>.
+
+The GNU C Library is free software; you can redistribute it and/or
+modify it under the terms of the GNU Library General Public License as
+published by the Free Software Foundation; either version 2 of the
+License, or (at your option) any later version.
+
+The GNU C Library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+Library General Public License for more details.
+
+You should have received a copy of the GNU Library General Public
+License along with the GNU C Library; see the file COPYING.LIB.  If
+not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
+
+#include <ctype.h>
+#include <wctype.h>
+
+#include "cname-lookup.h"
+
+
+extern unsigned int *__ctype32_b;
+
+
+int
+iswctype (wint_t wc, wctype_t desc)
+{
+  size_t idx;
+
+  idx = cname_lookup (wc);
+  if (idx == ~((size_t) 0))
+    return 0;
+
+  return __ctype32_b[idx] & desc;
+}
diff --git a/wctype/test_wctype.c b/wctype/test_wctype.c
new file mode 100644
index 0000000000..bf3de172df
--- /dev/null
+++ b/wctype/test_wctype.c
@@ -0,0 +1,75 @@
+/* Copyright (C) 1996 Free Software Foundation, Inc.
+This file is part of the GNU C Library.
+
+The GNU C Library is free software; you can redistribute it and/or
+modify it under the terms of the GNU Library General Public License as
+published by the Free Software Foundation; either version 2 of the
+License, or (at your option) any later version.
+
+The GNU C Library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+Library General Public License for more details.
+
+You should have received a copy of the GNU Library General Public
+License along with the GNU C Library; see the file COPYING.LIB.  If
+not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
+
+#include <ctype.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <wctype.h>
+
+int
+main (int argc, char *argv[])
+{
+  int result = 0;
+  wctype_t bit_alnum = wctype ("alnum");
+  wctype_t bit_alpha = wctype ("alpha");
+  wctype_t bit_cntrl = wctype ("cntrl");
+  wctype_t bit_digit = wctype ("digit");
+  wctype_t bit_graph = wctype ("graph");
+  wctype_t bit_lower = wctype ("lower");
+  wctype_t bit_print = wctype ("print");
+  wctype_t bit_punct = wctype ("punct");
+  wctype_t bit_space = wctype ("space");
+  wctype_t bit_upper = wctype ("upper");
+  wctype_t bit_xdigit = wctype ("xdigit");
+  int ch;
+
+  if (wctype ("does not exist") != 0)
+    {
+      puts ("wctype return value != 0 for non existing property");
+      result = 1;
+    }
+
+  for (ch = 0; ch < 256; ++ch)
+    {
+#define TEST(test)							      \
+      do								      \
+	if (is##test (ch) != iswctype ((wchar_t) ch, bit_##test))	      \
+	  {								      \
+	    printf ("class `%s' test for character \\%o failed\n",	      \
+		    #test, ch);						      \
+	    result = 1;							      \
+	  }								      \
+      while (0)
+
+      TEST (alnum);
+      TEST (alpha);
+      TEST (cntrl);
+      TEST (digit);
+      TEST (graph);
+      TEST (lower);
+      TEST (print);
+      TEST (punct);
+      TEST (space);
+      TEST (upper);
+      TEST (xdigit);
+    }
+
+  if (result == 0)
+    puts ("All test successful!");
+  exit (result);
+}
diff --git a/wctype/towctrans.c b/wctype/towctrans.c
new file mode 100644
index 0000000000..fd15599a6e
--- /dev/null
+++ b/wctype/towctrans.c
@@ -0,0 +1,36 @@
+/* towctrans - map wide character using given mapping.
+Copyright (C) 1996 Free Software Foundation, Inc.
+This file is part of the GNU C Library.
+
+The GNU C Library is free software; you can redistribute it and/or
+modify it under the terms of the GNU Library General Public License as
+published by the Free Software Foundation; either version 2 of the
+License, or (at your option) any later version.
+
+The GNU C Library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+Library General Public License for more details.
+
+You should have received a copy of the GNU Library General Public
+License along with the GNU C Library; see the file COPYING.LIB.  If
+not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
+
+#include <wctype.h>
+
+/* Define the lookup function.  */
+#include "cname-lookup.h"
+
+wint_t
+towctrans (wint_t wc, wctrans_t desc)
+{
+  size_t idx;
+
+  idx = cname_lookup (wc);
+  if (idx == ~((size_t) 0))
+    /* Character is not known.  Default action is to simply return it.  */
+    return wc;
+
+  return (wint_t) desc[idx];
+}
diff --git a/wctype/wcfuncs.c b/wctype/wcfuncs.c
new file mode 100644
index 0000000000..b5ac890609
--- /dev/null
+++ b/wctype/wcfuncs.c
@@ -0,0 +1,52 @@
+/* Copyright (C) 1996 Free Software Foundation, Inc.
+This file is part of the GNU C Library.
+
+The GNU C Library is free software; you can redistribute it and/or
+modify it under the terms of the GNU Library General Public License as
+published by the Free Software Foundation; either version 2 of the
+License, or (at your option) any later version.
+
+The GNU C Library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+Library General Public License for more details.
+
+You should have received a copy of the GNU Library General Public
+License along with the GNU C Library; see the file COPYING.LIB.  If
+not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
+
+#define	__NO_WCTYPE
+#include <wctype.h>
+#include <ctype.h>	/* For __ctype_tolower and __ctype_toupper.  */
+
+/* Provide real-function versions of all the wctype macros.  */
+
+#define	func(name, type) \
+  int name (wc) wint_t wc; { return iswctype (wc, type); }
+
+func (iswalnum, _ISalnum)
+func (iswalpha, _ISalpha)
+func (iswcntrl, _IScntrl)
+func (iswdigit, _ISdigit)
+func (iswlower, _ISlower)
+func (iswgraph, _ISgraph)
+func (iswprint, _ISprint)
+func (iswpunct, _ISpunct)
+func (iswspace, _ISspace)
+func (iswupper, _ISupper)
+func (iswxdigit, _ISxdigit)
+
+wint_t
+towlower (wc)
+     wint_t wc;
+{
+  return towctrans (wc, __ctype_tolower);
+}
+
+wint_t
+towupper (wc)
+     wint_t wc;
+{
+  return towctrans (wc, __ctype_toupper);
+}
diff --git a/wctype/wctrans.c b/wctype/wctrans.c
new file mode 100644
index 0000000000..afe47a915d
--- /dev/null
+++ b/wctype/wctrans.c
@@ -0,0 +1,59 @@
+/* Copyright (C) 1996 Free Software Foundation, Inc.
+This file is part of the GNU C Library.
+Contributed by Ulrich Drepper, <drepper@gnu.ai.mit.edu>.
+
+The GNU C Library is free software; you can redistribute it and/or
+modify it under the terms of the GNU Library General Public License as
+published by the Free Software Foundation; either version 2 of the
+License, or (at your option) any later version.
+
+The GNU C Library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+Library General Public License for more details.
+
+You should have received a copy of the GNU Library General Public
+License along with the GNU C Library; see the file COPYING.LIB.  If
+not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
+
+#include <ctype.h>
+#include <string.h>
+#include <wctype.h>
+#include "localeinfo.h"
+
+wctrans_t
+wctrans (const char *property)
+{
+  const char *names;
+  size_t cnt;
+  unsigned int **result;
+
+  names = _NL_CURRENT (LC_CTYPE, _NL_CTYPE_MAP_NAMES);
+  cnt = 0;
+  while (names[0] != '\0')
+    {
+      if (strcmp (property, names) == 0)
+	break;
+
+      names = strchr (names, '\0') + 1;
+      ++cnt;
+    }
+
+  if (names[0] == '\0')
+    return 0;
+
+  if (cnt == 0)
+    return (wctrans_t) __ctype_toupper;
+  else if (cnt == 1)
+    return (wctrans_t) __ctype_tolower;
+
+  /* We have to search the table.  */
+  result = (unsigned int **) &_NL_CURRENT (LC_CTYPE, _NL_CTYPE_WIDTH);
+
+#if __BYTE_ORDER == _BIG_ENDIAN
+  return (wctrans_t) result[1 + 2 * cnt];
+#else
+  return (wctrans_t) result[1 + 2 * cnt + 1];
+#endif
+}
diff --git a/wctype/wctype.c b/wctype/wctype.c
new file mode 100644
index 0000000000..36db3b95a4
--- /dev/null
+++ b/wctype/wctype.c
@@ -0,0 +1,56 @@
+/* Copyright (C) 1996 Free Software Foundation, Inc.
+This file is part of the GNU C Library.
+Contributed by Ulrich Drepper, <drepper@gnu.ai.mit.edu>.
+
+The GNU C Library is free software; you can redistribute it and/or
+modify it under the terms of the GNU Library General Public License as
+published by the Free Software Foundation; either version 2 of the
+License, or (at your option) any later version.
+
+The GNU C Library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+Library General Public License for more details.
+
+You should have received a copy of the GNU Library General Public
+License along with the GNU C Library; see the file COPYING.LIB.  If
+not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
+
+#include <endian.h>
+#include <string.h>
+#include <wctype.h>
+#include "localeinfo.h"
+
+wctype_t
+wctype (const char *property)
+{
+  const char *names;
+  wctype_t result;
+
+  names = _NL_CURRENT (LC_CTYPE, _NL_CTYPE_CLASS_NAMES);
+  for (result = 1; result != 0; result <<= 1)
+    {
+      if (strcmp (property, names) == 0)
+	break;
+
+      names = strchr (names, '\0') + 1;
+      if (names[0] == '\0')
+	return 0;
+    }
+
+#if __BYTE_ORDER == __BIG_ENDIAN
+  return result;
+#else
+# define SWAPU32(w) \
+  (((w) << 24) | (((w) & 0xff00) << 8) | (((w) >> 8) & 0xff00) | ((w) >> 24))
+
+# define SWAPU16(w) \
+  (((w) >> 8) | ((w) << 8))
+
+  if (sizeof (wctype_t) == 4)
+    return SWAPU32 (result);
+  else
+    return SWAPU16 (result);
+#endif
+}
diff --git a/wctype/wctype.h b/wctype/wctype.h
new file mode 100644
index 0000000000..7e90e2bad5
--- /dev/null
+++ b/wctype/wctype.h
@@ -0,0 +1,215 @@
+/* Copyright (C) 1996 Free Software Foundation, Inc.
+This file is part of the GNU C Library.
+
+The GNU C Library is free software; you can redistribute it and/or
+modify it under the terms of the GNU Library General Public License as
+published by the Free Software Foundation; either version 2 of the
+License, or (at your option) any later version.
+
+The GNU C Library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+Library General Public License for more details.
+
+You should have received a copy of the GNU Library General Public
+License along with the GNU C Library; see the file COPYING.LIB.  If
+not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
+
+/*
+ *	ISO/IEC 9899:1990/Amendment 1:1995 7.15:
+ *	Wide-character classification and mapping utilities  <wctype.h>
+ */
+
+#ifndef _WCTYPE_H
+
+#define _WCTYPE_H	1
+#include <features.h>
+
+
+__BEGIN_DECLS
+
+/* FIXME: should this go into <stddef.h>???  */
+#if 0
+#define __need_wint_t
+#include <stddef.h>
+#else
+/* Integral type unchanged by default argument promotions that can
+   hold any value corresponding to members of the extended character
+   set, as well as at least one value that does not correspond to any
+   member of the extended character set.  */
+typedef unsigned int wint_t;
+#endif
+
+/* Scalar type that can hold values which represent locale-specific
+   character mappings.  */
+typedef const unsigned int *wctrans_t;
+
+/* Scalar type that can hold values which represent locale-specific
+   character classifications.  */
+#if 0
+typedef unsigned long int wctype_t;
+#else
+/* For compatibility reasons we have to use shorts for now.  */
+typedef unsigned short int wctype_t;
+#endif
+
+
+/* Constant expression of type `wint_t' whose value does not correspond
+   to any member of the extended character set.  */
+#ifndef WEOF
+#define WEOF (0xffffffffu)
+#endif
+
+#ifndef _ISbit
+/* These are all the characteristics of characters.
+   If there get to be more than 16 distinct characteristics,
+   many things must be changed that use `unsigned short int's.
+
+   The characteristics are stored always in network byte order (big
+   endian).  We define the bit value interpretations here dependent on the
+   machine's byte order.  */
+
+#include <endian.h>
+#if __BYTE_ORDER == __BIG_ENDIAN
+#define _ISbit(bit)	(1 << bit)
+#else /* __BYTE_ORDER == __LITTLE_ENDIAN */
+#define _ISbit(bit)	(bit < 8 ? ((1 << bit) << 8) : ((1 << bit) >> 8))
+#endif
+
+enum
+{
+  _ISupper = _ISbit (0),	/* UPPERCASE.  */
+  _ISlower = _ISbit (1),	/* lowercase.  */
+  _ISalpha = _ISbit (2),	/* Alphabetic.  */
+  _ISdigit = _ISbit (3),	/* Numeric.  */
+  _ISxdigit = _ISbit (4),	/* Hexadecimal numeric.  */
+  _ISspace = _ISbit (5),	/* Whitespace.  */
+  _ISprint = _ISbit (6),	/* Printing.  */
+  _ISgraph = _ISbit (7),	/* Graphical.  */
+  _ISblank = _ISbit (8),	/* Blank (usually SPC and TAB).  */
+  _IScntrl = _ISbit (9),	/* Control character.  */
+  _ISpunct = _ISbit (10),	/* Punctuation.  */
+  _ISalnum = _ISbit (11)	/* Alphanumeric.  */
+};
+#endif /* Not _ISbit  */
+
+
+/*
+ * Wide-character classification functions: 7.15.2.1.
+ */
+
+/* Test for any wide character for which `iswalpha' or `iswdigit' is
+   true.  */
+int iswalnum __P ((wint_t __wc));
+
+/* Test for any wide character for which `iswupper' or 'iswlower' is
+   true, or any wide character that is one of a locale-specific set of
+   wide-characters for which none of `iswcntrl', `iswdigit',
+   `iswpunct', or `iswspace' is true.  */
+int iswalpha __P ((wint_t __wc));
+
+/* Test for any control wide character.  */
+int iswcntrl __P ((wint_t __wc));
+
+/* Test for any wide character that corresponds to a decimal-digit
+   character.  */
+int iswdigit __P ((wint_t __wc));
+
+/* Test for any wide character for which `iswprint' is true and
+   `iswspace' is false.  */
+int iswgraph __P ((wint_t __wc));
+
+/* Test for any wide character that corresponds to a lowercase letter
+   or is one of a locale-specific set of wide characters for which
+   none of `iswcntrl', `iswdigit', `iswpunct', or `iswspace' is true.  */
+int iswlower __P ((wint_t __wc));
+
+/* Test for any printing wide character.  */
+int iswprint __P ((wint_t __wc));
+
+/* Test for any printing wide character that is one of a
+   locale-specific et of wide characters for which neither `iswspace'
+   nor `iswalnum' is true.  */
+int iswpunct __P ((wint_t __wc));
+
+/* Test for any wide character that corresponds to a locale-specific
+   set of wide characters for which none of `iswalnum', `iswgraph', or
+   `iswpunct' is true.  */
+int iswspace __P ((wint_t __wc));
+
+/* Test for any wide character that corresponds to an uppercase letter
+   or is one of a locale-specific set of wide character for which none
+   of `iswcntrl', `iswdigit', `iswpunct', or `iswspace' is true.  */
+int iswupper __P ((wint_t __wc));
+
+/* Test for any wide character that corresponds to a hexadecimal-digit
+   character equivalent to that performed be the functions described
+   in the previous subclause.  */
+int iswxdigit __P ((wint_t __wc));
+
+/*
+ * Extensible wide-character classification functions: 7.15.2.2.
+ */
+
+/* Construct value that describes a class of wide characters identified
+   by the string argument PROPERTY.  */
+wctype_t wctype __P ((__const char *__property));
+
+/* Determine whether the wide-character WC has the property described by
+   DESC.  */
+int iswctype __P ((wint_t __wc, wctype_t __desc));
+
+
+/*
+ * Wide-character case-mapping functions: 7.15.3.1.
+ */
+
+/* Converts an uppercase letter to the corresponding lowercase letter.  */
+wint_t towlower __P ((wint_t __wc));
+
+/* Converts an lowercase letter to the corresponding uppercase letter.  */
+wint_t towupper __P ((wint_t __wc));
+
+/*
+ * Extensible wide-character mapping functions: 7.15.3.2.
+ */
+
+/* Construct value that describes a mapping between wide characters
+   identified by the string argument PROPERTY.  */
+wctrans_t wctrans __P ((__const char *__property));
+
+/* Map the wide character WC using the mapping described by DESC.  */
+wint_t towctrans __P ((wint_t __wc, wctrans_t __desc));
+
+
+
+#ifndef	__NO_WCTYPE
+#define	iswalnum(wc)	iswctype ((wc), _ISalnum)
+#define	iswalpha(wc)	iswctype ((wc), _ISalpha)
+#define	iswcntrl(wc)	iswctype ((wc), _IScntrl)
+#define	iswdigit(wc)	iswctype ((wc), _ISdigit)
+#define	iswlower(wc)	iswctype ((wc), _ISlower)
+#define	iswgraph(wc)	iswctype ((wc), _ISgraph)
+#define	iswprint(wc)	iswctype ((wc), _ISprint)
+#define	iswpunct(wc)	iswctype ((wc), _ISpunct)
+#define	iswspace(wc)	iswctype ((wc), _ISspace)
+#define	iswupper(wc)	iswctype ((wc), _ISupper)
+#define	iswxdigit(wc)	iswctype ((wc), _ISxdigit)
+
+#ifdef	__USE_GNU
+#define	iswblank(wc)	iswctype ((wc), _ISblank)
+#endif
+
+/* Pointer to conversion tables.  */
+extern __const int *__ctype_tolower; /* Case conversions.  */
+extern __const int *__ctype_toupper; /* Case conversions.  */
+
+#define	towlower(wc)	towctrans (wc, __ctype_tolower)
+#define	towupper(wc)	towctrans (wc, __ctype_toupper)
+
+#endif /* Not __NO_WCTYPE.  */
+
+__END_DECLS
+
+#endif /* wctype.h  */