Update.

	* Versions.def: Add GLIBC_2.2 for libc.

	* iconv/gconv.h: Make header suitable for inclusion in public header
	by protecting all names with __.
	* iconv/gconv.c: Adapt for symbol name changes.
	* iconv/gconv.h: Likewise.
	* iconv/gconv_builtin.c: Likewise.
	* iconv/gconv_close.c: Likewise.
	* iconv/gconv_db.c: Likewise.
	* iconv/gconv_dl.c: Likewise.
	* iconv/gconv_int.h: Likewise.
	* iconv/gconv_open.c: Likewise.
	* iconv/gconv_simple.c: Likewise.
	* iconv/iconv.c: Likewise.
	* iconv/iconv_close.c: Likewise.
	* iconv/iconv_open.c: Likewise.
	* iconv/loop.c: Likewise.
	* iconv/skeleton.c: Likewise.
	* iconvdata/8bit-gap.c: Likewise.
	* iconvdata/8bit-generic.c: Likewise.
	* iconvdata/ansi_x3.110.c: Likewise.
	* iconvdata/big5.c: Likewise.
	* iconvdata/cns11643.h: Likewise.
	* iconvdata/cns11643l1.h: Likewise.
	* iconvdata/euc-cn.c: Likewise.
	* iconvdata/euc-jp.c: Likewise.
	* iconvdata/euc-kr.c: Likewise.
	* iconvdata/euc-tw.c: Likewise.
	* iconvdata/gb2312.h: Likewise.
	* iconvdata/iso-2022-jp.c: Likewise.
	* iconvdata/iso-2022-kr.c: Likewise.
	* iconvdata/iso646.c: Likewise.
	* iconvdata/iso8859-1.c: Likewise.
	* iconvdata/iso_6937-2.c: Likewise.
	* iconvdata/iso_6937.c: Likewise.
	* iconvdata/jis0201.h: Likewise.
	* iconvdata/jis0208.h: Likewise.
	* iconvdata/jis0212.h: Likewise.
	* iconvdata/johab.c: Likewise.
	* iconvdata/ksc5601.h: Likewise.
	* iconvdata/sjis.c: Likewise.
	* iconvdata/t.61.c: Likewise.
	* iconvdata/uhc.c: Likewise.
	* stdlib/mblen.c: Likewise.
	* stdlib/mbtowc.c: Likewise.
	* stdlib/wctomb.c: Likewise.
	* wcsmbs/btowc.c: Likewise.
	* wcsmbs/mbrtowc.c: Likewise.
	* wcsmbs/mbsnrtowcs.c: Likewise.
	* wcsmbs/mbsrtowcs.c: Likewise.
	* wcsmbs/wchar.h: Likewise.
	* wcsmbs/wcrtomb.c: Likewise.
	* wcsmbs/wcsmbsload.c: Likewise.
	* wcsmbs/wcsmbsload.h: Likewise.
	* wcsmbs/wcsnrtombs.c: Likewise.
	* wcsmbs/wcsrtombs.c: Likewise.
	* wcsmbs/wctob.c: Likewise.

	* include/limits.h (MB_LEN_MAX): Increase to 16.

	* sysdeps/generic/_G_config.h: Define _G_fpos_t as struct.  Define
	_G_iconv_t.
	* sysdeps/unix/sysv/linux/_G_config.h: Likewise.
	* include/wchar.h: Change mbstate_t to __mbstate_t.

	* libio/Makefile (routines): Add wfiledoalloc, oldiofgetpos,
	oldiofgetpos64, oldiofsetpos, oldiofsetpos64, fputwc, fputwc_u,
	getwc, getwc_u, getwchar, getwchar_u, iofgetws, iofgetws_u,
	iofputws, iofputws_u, iogetwline, iowpadn, ioungetwc, putwc, putwc_u,
	putchar, putchar_u, swprintf, vwprintf, wprintf, wscanf, fwscanf,
	vwscanf, vswprintf, iovswscanf, swscanf, wgenops, wstrops, wfileops,
	and iofwide.
	(tests): Add tst_swprintf, tst_wprintf, tst_swscanf, and tst_wscanf.
	* libio/Versions: Add _IO_fgetpos, _IO_fgetpos64, _IO_fsetpos,
	_IO_fsetpos64, fgetpos, fgetpos64, fgetwc, fgetwc_unlocked, fgetws,
	fgetws_unlocked, fputwc, fputwc_unlocked, fputws, fputws_unlocked,
	fsetpos, fsetpos64, fwide, fwprintf, fwscanf, getwc, getwc_unlocked,
	getwchar, getwchar_unlocked, putwc, putwc_unlocked, putwchar,
	putwchar_unlocked, swprintf, swscanf, ungetwc, vfwprintf, vswprintf,
	vwprintf, vfwscanf, vswscanf, vwscanf, wprintf, and wscanf to
	GLIBC_2.2 for libc.
	* libio/libio.h: Define codecvt struct.  Define _IO_wide_data.
	Extend _IO_file contain pointer to codecvt, widedata and mode.
	(_IO_getwc_unlocked): New macro.
	(_IO_putwc_unlocked): New macro.
	(_IO_fwide): New macro.
	* libio/libioP.h: Add new prototypes and adjust existing declarations.
	* libio/fileops.c (_IO_new_file_close_it): Reset normal or widedata
	buffers based on mode.
	(new_do_write): Set _IO_write_end to _IO_buf_end if stream is wide
	oriented.
	(_IO_new_file_overflow): Don't depend only on _IO_CURRENTLY_PUTTING
	flag to be enough to signal unallocated buffer.  For wide oriented
	stream don't make it linebuffered.  Don't use _IO_do_flush, use
	_IO_new_do_write directly.
	(_IO_new_file_seekoff): Change return value type to _IO_off64_t.
	(_IO_file_seek): Likewise.
	* libio/genops.c (_IO_least_marker): Make global.
	(__underflow): Orient stream if not already done.
	(__uflow): Likewise.
	(_IO_default_seekpos): Change to type _IO_off64_t.
	(_IO_default_seekoff): Likewise.
	(_IO_default_seek): Likewise.
	(_IO_no_init): New function.  Similar to _IO_init but allows to orient
	in initialization.
	* libio/iolibio.h: Add prototype for _IO_vswprintf.  Change _IO_pos_BAD
	to use _IO_off64_t.
	* libio/ftello.c: Use _IO_off_t.  For now abort when use with wide
	char stream.
	* libio/ftello64.c: Likewise.
	* libio/ioftell.c: Likewise.
	* libio/iofopncook.c: Likewise.
	* libio/ioseekoff.c: Likewise.
	* libio/ioseekpos.c: Likewise.
	* libio/oldfileops.c: Likewise.
	* libio/iofgetpos.c: Store state of conversion if necessary.
	* libio/iofgetpos64.c: Likewise.
	* libio/iofsetpos.c: Restore conversion state if necessary.
	* libio/iofsetpos64.c: Likewise.
	* libio/iofdopen.c: Initialize so that stream can be wide oriented.
	* libio/iofopen.c: Likewise.
	* libio/iofopen64.c: Likewise.
	* libio/iopopen.c: Likewise.
	* libio/iovdprintf.c: Likewise.
	* libio/iovsprintf.c: Likewise.
	* libio/iovsscanf.c: Likewise.
	* libio/memstream.c: Likewise.
	* libio/obprintf.c: Likewise.
	* libio/iofputs.c: Orient stream if not already happened.
	* libio/iofputs_u.c: Likewise.
	* libio/iofwrite.c: Likewise.
	* libio/iofwrite_u.c: Likewise.
	* libio/ioputs.c: Likewise.
	* libio/iosetbuffer.c: Handle not yet oriented stream.
	* libio/iosetvbuf.c: Likewise.
	* libio/oldstdfiles.c: Adjust FILEBUF_LITERAL call.
	* libio/stdfiles.c: Likewise.
	* libio/strops.c (_IO_str_overflow): Correctly free buffer after
	failed allocation.
	(_IO_str_seekoff): Use _IO_off64_t.
	* libio/vasprintf.c: Pre-orient stream.
	* libio/vsnprintf.c: Likewise.
	* libio/fputwc.c: New file.
	* libio/fputwc_u.c: New file.
	* libio/fwprintf.c: New file.
	* libio/fwscanf.c: New file.
	* libio/getwc.c: New file.
	* libio/getwc_u.c: New file.
	* libio/getwchar.c: New file.
	* libio/getwchar_u.c: New file.
	* libio/iofgetws.c: New file.
	* libio/iofgetws_u.c: New file.
	* libio/iofputws.c: New file.
	* libio/iofputws_u.c: New file.
	* libio/iofwide.c: New file.
	* libio/iogetwline.c: New file.
	* libio/ioungetwc.c: New file.
	* libio/iovswscanf.c: New file.
	* libio/iowpadn.c: New file.
	* libio/oldiofgetpos.c: New file.
	* libio/oldiofgetpos64.c: New file.
	* libio/oldiofsetpos.c: New file.
	* libio/oldiofsetpos64.c: New file.
	* libio/putwc.c: New file.
	* libio/putwc_u.c: New file.
	* libio/putwchar.c: New file.
	* libio/putwchar_u.c: New file.
	* libio/swprintf.c: New file.
	* libio/swscanf.c: New file.
	* libio/tst_swprintf.c: New file.
	* libio/tst_swscanf.c: New file.
	* libio/tst_wprintf.c: New file.
	* libio/tst_wscanf.c: New file.
	* libio/tst_wscanf.input: New file.
	* libio/vswprintf.c: New file.
	* libio/vwprintf.c: New file.
	* libio/vwscanf.c: New file.
	* libio/wfiledoalloc.c: New file.
	* libio/wfileops.c: New file.
	* libio/wgenops.c: New file.
	* libio/wprintf.c: New file.
	* libio/wscanf.c: New file.
	* libio/wstrops.c: New file.
	* stdio-common/Makefile (routines): Add _itowa, itowa-digits,
	vfwprintf, and vfwscanf.
	* stdio-common/_itoa.c (base_table): Rename to _IO_base_table and
	make global.
	* stdio-common/_itowa.c: New file.
	* stdio-common/_itowa.h: New file.
	* stdio-common/itoa-digits.c: Minimal optimization.
	* stdio-common/itowa-digits.c: New file.
	* stdio-common/printf-parse.h: Allow use in wide character context.
	* stdio-common/printf-prs.c: Define ISASCII and MBRLEN.
	* stdio-common/printf.h (printf_info): Add wide bit.
	* stdio-common/printf_fp.c: Determine from wide bit whether stream
	is wide oriented or not.
	* stdio-common/printf_size.c: Likewise.
	* sysdeps/generic/printf_fphex.c: Likewise.
	* stdlib/strfmon.c: Call __printf_fp with wide bit cleared.
	* stdio-common/vfprintf.c: Rewrite to allow use in wide character
	context.
	* stdio-common/vfscand.c: Likewise.
	* stdio-common/vfwprintf.c: New file.
	* stdio-common/vfwscanf.c: New file.

	* time/Makefile (routines): Add wcsftime.
	(tests): Add tst_wcsftime.
	* time/Versions: Add wcsftime to GLIBC_2.2 for libc.
	* time/strftime.c: Make usable as wcsftime.
	* time/wcsftime.c: New file.
	* time/tst_wcsftime.c: New file.

	* wcsmbs/Makefile (routines): Add wmempcpy and wcschrnul.
	* wcsmbs/Versions: Add wmempcpy and wcschrnul to GLIBC_2.2 for libc.
	* wcsmbs/wcschrnul.c: New file.
	* wcsmbs/wmemcpy.c: New file.
	* wcsmbs/wmemcpy.c: Rename to __wmemcpy and make wmemcpy weak alias.
	* wcsmbs/wmemmove.c: Likewise for wmemmove.

	* manual/stdio.texi: Document is_char and wide element if printf_info.

	* manual/time.texi: Document wcsftime.

	* include/wchar.h: Add prototypes for __wmemcpy, __wmempcpy,
	__wmemmove, __wcschrnul, and __vfwscanf.

	* locale/langinfo.h: Add new LC_TIME entries for wchar_t data.
	* locale/C-time.c: Adapt for above change.
	* locale/categories.def: Likewise.
	* locale/localeinfo.h: Likewise.
	* localedata/Makefile: Don't run tests for now.

1 files changed, 102 insertions, 102 deletions

diff --git a/iconvdata/iso646.c b/iconvdata/iso646.c
index 701a71db44..5b2ba7282f 100644
--- a/iconvdata/iso646.c
+++ b/iconvdata/iso646.c
@@ -1,5 +1,5 @@
 /* Conversion to and from the various ISO 646 CCS.
-   Copyright (C) 1998 Free Software Foundation, Inc.
+   Copyright (C) 1998, 1999 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998.
 
@@ -45,8 +45,8 @@
 #define MIN_NEEDED_TO		4
 #define FROM_DIRECTION		(dir == from_iso646)
 #define PREPARE_LOOP \
-  enum direction dir = ((struct iso646_data *) step->data)->dir;	      \
-  enum variant var = ((struct iso646_data *) step->data)->var;
+  enum direction dir = ((struct iso646_data *) step->__data)->dir;	      \
+  enum variant var = ((struct iso646_data *) step->__data)->var;
 #define EXTRA_LOOP_ARGS		, var
 
 
@@ -124,7 +124,7 @@ struct iso646_data
 
 
 int
-gconv_init (struct gconv_step *step)
+gconv_init (struct __gconv_step *step)
 {
   /* Determine which direction.  */
   struct iso646_data *new_data;
@@ -133,47 +133,47 @@ gconv_init (struct gconv_step *step)
   int result;
 
   for (var = sizeof (names) / sizeof (names[0]) - 1; var > illegal_var; --var)
-    if (__strcasecmp (step->from_name, names[var]) == 0)
+    if (__strcasecmp (step->__from_name, names[var]) == 0)
       {
 	dir = from_iso646;
 	break;
       }
-    else if (__strcasecmp (step->to_name, names[var]) == 0)
+    else if (__strcasecmp (step->__to_name, names[var]) == 0)
       {
 	dir = to_iso646;
 	break;
       }
 
-  result = GCONV_NOCONV;
+  result = __GCONV_NOCONV;
   if (dir != illegal_dir)
     {
       new_data = (struct iso646_data *) malloc (sizeof (struct iso646_data));
 
-      result = GCONV_NOMEM;
+      result = __GCONV_NOMEM;
       if (new_data != NULL)
 	{
 	  new_data->dir = dir;
 	  new_data->var = var;
-	  step->data = new_data;
+	  step->__data = new_data;
 
 	  if (var == from_iso646)
 	    {
-	      step->min_needed_from = MIN_NEEDED_FROM;
-	      step->max_needed_from = MIN_NEEDED_FROM;
-	      step->min_needed_to = MIN_NEEDED_TO;
-	      step->max_needed_to = MIN_NEEDED_TO;
+	      step->__min_needed_from = MIN_NEEDED_FROM;
+	      step->__max_needed_from = MIN_NEEDED_FROM;
+	      step->__min_needed_to = MIN_NEEDED_TO;
+	      step->__max_needed_to = MIN_NEEDED_TO;
 	    }
 	  else
 	    {
-	      step->min_needed_from = MIN_NEEDED_TO;
-	      step->max_needed_from = MIN_NEEDED_TO;
-	      step->min_needed_to = MIN_NEEDED_FROM;
-	      step->max_needed_to = MIN_NEEDED_FROM;
+	      step->__min_needed_from = MIN_NEEDED_TO;
+	      step->__max_needed_from = MIN_NEEDED_TO;
+	      step->__min_needed_to = MIN_NEEDED_FROM;
+	      step->__max_needed_to = MIN_NEEDED_FROM;
 	    }
 
-	  step->stateful = 0;
+	  step->__stateful = 0;
 
-	  result = GCONV_OK;
+	  result = __GCONV_OK;
 	}
     }
 
@@ -182,9 +182,9 @@ gconv_init (struct gconv_step *step)
 
 
 void
-gconv_end (struct gconv_step *data)
+gconv_end (struct __gconv_step *data)
 {
-  free (data->data);
+  free (data->__data);
 }
 
 
@@ -195,7 +195,7 @@ gconv_end (struct gconv_step *data)
 #define BODY \
   {									      \
     uint32_t ch;							      \
-    int failure = GCONV_OK;						      \
+    int failure = __GCONV_OK;						      \
 									      \
     ch = *inptr;							      \
     switch (ch)								      \
@@ -308,7 +308,7 @@ gconv_end (struct gconv_step *data)
 	  ch = 0xf9;							      \
 	else if (var == JP_OCR_B)					      \
 	  /* Illegal character.  */					      \
-	  failure = GCONV_ILLEGAL_INPUT;				      \
+	  failure = __GCONV_ILLEGAL_INPUT;				      \
 	else if (var == YU)						      \
 	  ch = 0x17e;							      \
 	else if (var == HU)						      \
@@ -382,7 +382,7 @@ gconv_end (struct gconv_step *data)
 	  ch = 0xec;							      \
 	else if (var == JP_OCR_B)					      \
 	  /* Illegal character.  */					      \
-	  failure = GCONV_ILLEGAL_INPUT;				      \
+	  failure = __GCONV_ILLEGAL_INPUT;				      \
 	else if (var == YU)						      \
 	  ch = 0x10d;							      \
 	else if (var == HU)						      \
@@ -398,13 +398,13 @@ gconv_end (struct gconv_step *data)
 	break;								      \
       case 0x80 ... 0xff:						      \
 	/* Illegal character.  */					      \
-	failure = GCONV_ILLEGAL_INPUT;					      \
+	failure = __GCONV_ILLEGAL_INPUT;				      \
 	break;								      \
       }									      \
 									      \
     /* Hopefully gcc can recognize that the following `if' is only true	      \
        when we reach the default case in the `switch' statement.  */	      \
-    if (failure == GCONV_ILLEGAL_INPUT)					      \
+    if (failure == __GCONV_ILLEGAL_INPUT)				      \
       {									      \
 	/* Exit the loop with an error.  */				      \
 	result = failure;						      \
@@ -424,7 +424,7 @@ gconv_end (struct gconv_step *data)
 #define BODY \
   {									      \
     unsigned char ch;							      \
-    int failure = GCONV_OK;						      \
+    int failure = __GCONV_OK;						      \
 									      \
     ch = *((uint32_t *) inptr);						      \
     switch (*((uint32_t *) inptr))					      \
@@ -432,17 +432,17 @@ gconv_end (struct gconv_step *data)
       case 0x23:							      \
 	if (var == GB || var == ES || var == IT || var == FR || var == FR1    \
 	    || var == NO2)						      \
-	  failure = GCONV_ILLEGAL_INPUT;				      \
+	  failure = __GCONV_ILLEGAL_INPUT;				      \
 	break;								      \
       case 0x24:							      \
 	if (var == CN || var == HU || var == CU || var == SE || var == SE2)   \
-	  failure = GCONV_ILLEGAL_INPUT;				      \
+	  failure = __GCONV_ILLEGAL_INPUT;				      \
 	break;								      \
       case 0x40:							      \
 	if (var == CA || var == CA2 || var == DE || var == ES || var == ES2   \
 	    || var == IT || var == YU || var == HU || var == FR || var == FR1 \
 	    || var == PT || var == PT2 || var == SE2)			      \
-	  failure = GCONV_ILLEGAL_INPUT;				      \
+	  failure = __GCONV_ILLEGAL_INPUT;				      \
 	break;								      \
       case 0x5b:							      \
 	if (var == CA || var == CA2 || var == DE || var == DK || var == ES    \
@@ -450,7 +450,7 @@ gconv_end (struct gconv_step *data)
 	    || var == HU || var == FR || var == FR1 || var == NO	      \
 	    || var == NO2 || var == PT || var == PT2 || var == SE	      \
 	    || var == SE2)						      \
-	  failure = GCONV_ILLEGAL_INPUT;				      \
+	  failure = __GCONV_ILLEGAL_INPUT;				      \
 	else if (var == CU)						      \
 	  ch = 0x7d;							      \
 	break;								      \
@@ -460,7 +460,7 @@ gconv_end (struct gconv_step *data)
 	    || var == YU || var == KR || var == HU || var == CU || var == FR  \
 	    || var == FR1 || var == NO || var == NO2 || var == PT	      \
 	    || var == PT2 || var == SE || var == SE2)			      \
-	  failure = GCONV_ILLEGAL_INPUT;				      \
+	  failure = __GCONV_ILLEGAL_INPUT;				      \
 	break;								      \
       case 0x5d:							      \
 	if (var == CA || var == CA2 || var == DE || var == DK || var == ES    \
@@ -468,17 +468,17 @@ gconv_end (struct gconv_step *data)
 	    || var == HU || var == FR || var == FR1 || var == NO	      \
 	    || var == NO2 || var == PT || var == PT2 || var == SE	      \
 	    || var == SE2)						      \
-	  failure = GCONV_ILLEGAL_INPUT;				      \
+	  failure = __GCONV_ILLEGAL_INPUT;				      \
 	break;								      \
       case 0x5e:							      \
 	if (var == CA || var == CA2 || var == ES2 || var == YU || var == CU   \
 	    || var == SE2)						      \
-	  failure = GCONV_ILLEGAL_INPUT;				      \
+	  failure = __GCONV_ILLEGAL_INPUT;				      \
 	break;								      \
       case 0x60:							      \
 	if (var == CA || var == CA2 || var == IT || var == JP_OCR_B	      \
 	    || var == YU || var == HU || var == FR || var == SE2)	      \
-	  failure = GCONV_ILLEGAL_INPUT;				      \
+	  failure = __GCONV_ILLEGAL_INPUT;				      \
 	break;								      \
       case 0x7b:							      \
 	if (var == CA || var == CA2 || var == DE || var == DK || var == ES    \
@@ -486,14 +486,14 @@ gconv_end (struct gconv_step *data)
 	    || var == CU || var == FR || var == FR1 || var == NO	      \
 	    || var == NO2 || var == PT || var == PT2 || var == SE	      \
 	    || var == SE2)						      \
-	  failure = GCONV_ILLEGAL_INPUT;				      \
+	  failure = __GCONV_ILLEGAL_INPUT;				      \
 	break;								      \
       case 0x7c:							      \
 	if (var == CA || var == CA2 || var == DE || var == DK || var == ES    \
 	    || var == ES2 || var == IT || var == YU || var == HU || var == CU \
 	    || var == FR || var == FR1 || var == NO || var == PT	      \
 	    || var == PT2 || var == SE || var == SE2)			      \
-	  failure = GCONV_ILLEGAL_INPUT;				      \
+	  failure = __GCONV_ILLEGAL_INPUT;				      \
 	else if (var == NO2)						      \
 	  ch = 0x7e;							      \
 	break;								      \
@@ -502,7 +502,7 @@ gconv_end (struct gconv_step *data)
 	    || var == ES2 || var == IT || var == YU || var == HU || var == CU \
 	    || var == FR || var == FR1 || var == NO || var == NO2	      \
 	    || var == PT || var == PT2 || var == SE || var == SE2)	      \
-	  failure = GCONV_ILLEGAL_INPUT;				      \
+	  failure = __GCONV_ILLEGAL_INPUT;				      \
 	break;								      \
       case 0x7e:							      \
 	if (var == GB || var == CA || var == CA2 || var == DE || var == ES2   \
@@ -510,21 +510,21 @@ gconv_end (struct gconv_step *data)
 	    || var == YU || var == HU || var == CU || var == FR || var == FR1 \
 	    || var == NO || var == NO2 || var == PT || var == SE	      \
 	    || var == SE2)						      \
-	  failure = GCONV_ILLEGAL_INPUT;				      \
+	  failure = __GCONV_ILLEGAL_INPUT;				      \
 	break;								      \
       case 0xa1:							      \
 	if (var != ES && var != ES2 && var != CU)			      \
-	  failure = GCONV_ILLEGAL_INPUT;				      \
+	  failure = __GCONV_ILLEGAL_INPUT;				      \
 	ch = 0x5b;							      \
 	break;								      \
       case 0xa3:							      \
 	if (var != GB && var != ES && var != IT && var != FR && var != FR1)   \
-	  failure = GCONV_ILLEGAL_INPUT;				      \
+	  failure = __GCONV_ILLEGAL_INPUT;				      \
 	ch = 0x23;							      \
 	break;								      \
       case 0xa4:							      \
 	if (var != HU && var != CU && var != SE && var != SE2)		      \
-	  failure = GCONV_ILLEGAL_INPUT;				      \
+	  failure = __GCONV_ILLEGAL_INPUT;				      \
 	ch = 0x24;							      \
 	break;								      \
       case 0xa5:							      \
@@ -533,7 +533,7 @@ gconv_end (struct gconv_step *data)
 	else if (var == JP || var == JP_OCR_B)				      \
 	  ch = 0x5c;							      \
 	else								      \
-	  failure = GCONV_ILLEGAL_INPUT;				      \
+	  failure = __GCONV_ILLEGAL_INPUT;				      \
 	break;								      \
       case 0xa7:							      \
 	if (var == DE || var == ES || var == IT || var == PT)		      \
@@ -543,11 +543,11 @@ gconv_end (struct gconv_step *data)
 	else if (var == NO2)						      \
 	  ch = 0x23;							      \
 	else								      \
-	  failure = GCONV_ILLEGAL_INPUT;				      \
+	  failure = __GCONV_ILLEGAL_INPUT;				      \
 	break;								      \
       case 0xa8:							      \
 	if (var != ES2 && var != CU && var != FR && var != FR1)		      \
-	  failure = GCONV_ILLEGAL_INPUT;				      \
+	  failure = __GCONV_ILLEGAL_INPUT;				      \
 	ch = 0x7e;							      \
 	break;								      \
       case 0xb0:							      \
@@ -558,7 +558,7 @@ gconv_end (struct gconv_step *data)
 	else if (var == PT)						      \
 	  ch = 0x7e;							      \
 	else								      \
-	  failure = GCONV_ILLEGAL_INPUT;				      \
+	  failure = __GCONV_ILLEGAL_INPUT;				      \
 	break;								      \
       case 0xb4:							      \
 	if (var == ES2 || var == CU)					      \
@@ -566,11 +566,11 @@ gconv_end (struct gconv_step *data)
 	else if (var == PT2)						      \
 	  ch = 0x40;							      \
 	else								      \
-	  failure = GCONV_ILLEGAL_INPUT;				      \
+	  failure = __GCONV_ILLEGAL_INPUT;				      \
 	break;								      \
       case 0xb5:							      \
 	if (var != FR)							      \
-	  failure = GCONV_ILLEGAL_INPUT;				      \
+	  failure = __GCONV_ILLEGAL_INPUT;				      \
 	ch = 0x60;							      \
 	break;								      \
       case 0xbf:							      \
@@ -579,31 +579,31 @@ gconv_end (struct gconv_step *data)
 	else if (var == ES2 || var == CU)				      \
 	  ch = 0x5e;							      \
 	else								      \
-	  failure = GCONV_ILLEGAL_INPUT;				      \
+	  failure = __GCONV_ILLEGAL_INPUT;				      \
 	break;								      \
       case 0xc1:							      \
 	if (var != HU)							      \
-	  failure = GCONV_ILLEGAL_INPUT;				      \
+	  failure = __GCONV_ILLEGAL_INPUT;				      \
 	ch = 0x40;							      \
 	break;								      \
       case 0xc3:							      \
 	if (var != PT && var != PT2)					      \
-	  failure = GCONV_ILLEGAL_INPUT;				      \
+	  failure = __GCONV_ILLEGAL_INPUT;				      \
 	ch = 0x5b;							      \
 	break;								      \
       case 0xc4:							      \
 	if (var != DE && var != SE && var != SE2)			      \
-	  failure = GCONV_ILLEGAL_INPUT;				      \
+	  failure = __GCONV_ILLEGAL_INPUT;				      \
 	ch = 0x5b;							      \
 	break;								      \
       case 0xc5:							      \
 	if (var != DK && var != NO && var != NO2 && var != SE && var != SE2)  \
-	  failure = GCONV_ILLEGAL_INPUT;				      \
+	  failure = __GCONV_ILLEGAL_INPUT;				      \
 	ch = 0x5d;							      \
 	break;								      \
       case 0xc6:							      \
 	if (var != DK && var != NO && var != NO2)			      \
-	  failure = GCONV_ILLEGAL_INPUT;				      \
+	  failure = __GCONV_ILLEGAL_INPUT;				      \
 	ch = 0x5b;							      \
 	break;								      \
       case 0xc7:							      \
@@ -612,7 +612,7 @@ gconv_end (struct gconv_step *data)
 	else if (var == PT || var == PT2)				      \
 	  ch = 0x5c;							      \
 	else								      \
-	  failure = GCONV_ILLEGAL_INPUT;				      \
+	  failure = __GCONV_ILLEGAL_INPUT;				      \
 	break;								      \
       case 0xc9:							      \
 	if (var == CA2)							      \
@@ -622,26 +622,26 @@ gconv_end (struct gconv_step *data)
 	else if (var == SE2)						      \
 	  ch = 0x40;							      \
 	else								      \
-	  failure = GCONV_ILLEGAL_INPUT;				      \
+	  failure = __GCONV_ILLEGAL_INPUT;				      \
 	break;								      \
       case 0xd1:							      \
 	if (var != ES && var != ES2 && var != CU)			      \
-	  failure = GCONV_ILLEGAL_INPUT;				      \
+	  failure = __GCONV_ILLEGAL_INPUT;				      \
 	ch = 0x5c;							      \
 	break;								      \
       case 0xd5:							      \
 	if (var != PT && var != PT2)					      \
-	  failure = GCONV_ILLEGAL_INPUT;				      \
+	  failure = __GCONV_ILLEGAL_INPUT;				      \
 	ch = 0x5d;							      \
 	break;								      \
       case 0xd6:							      \
 	if (var != DE && var != HU && var != SE && var != SE2)		      \
-	  failure = GCONV_ILLEGAL_INPUT;				      \
+	  failure = __GCONV_ILLEGAL_INPUT;				      \
 	ch = 0x5c;							      \
 	break;								      \
       case 0xd8:							      \
 	if (var != DK && var != NO && var != NO2)			      \
-	  failure = GCONV_ILLEGAL_INPUT;				      \
+	  failure = __GCONV_ILLEGAL_INPUT;				      \
 	ch = 0x5c;							      \
 	break;								      \
       case 0xdc:							      \
@@ -650,11 +650,11 @@ gconv_end (struct gconv_step *data)
 	else if (var == SE2)						      \
 	  ch = 0x5e;							      \
 	else								      \
-	  failure = GCONV_ILLEGAL_INPUT;				      \
+	  failure = __GCONV_ILLEGAL_INPUT;				      \
 	break;								      \
       case 0xdf:							      \
 	if (var != DE)							      \
-	  failure = GCONV_ILLEGAL_INPUT;				      \
+	  failure = __GCONV_ILLEGAL_INPUT;				      \
 	ch = 0x7e;							      \
 	break;								      \
       case 0xe0:							      \
@@ -663,36 +663,36 @@ gconv_end (struct gconv_step *data)
 	else if (var == IT)						      \
 	  ch = 0x7b;							      \
 	else								      \
-	  failure = GCONV_ILLEGAL_INPUT;				      \
+	  failure = __GCONV_ILLEGAL_INPUT;				      \
 	break;								      \
       case 0xe1:							      \
 	if (var != HU)							      \
-	  failure = GCONV_ILLEGAL_INPUT;				      \
+	  failure = __GCONV_ILLEGAL_INPUT;				      \
 	ch = 0x60;							      \
 	break;								      \
       case 0xe2:							      \
 	if (var != CA && var != CA2)					      \
-	  failure = GCONV_ILLEGAL_INPUT;				      \
+	  failure = __GCONV_ILLEGAL_INPUT;				      \
 	ch = 0x5b;							      \
 	break;								      \
       case 0xe3:							      \
 	if (var != PT && var != PT2)					      \
-	  failure = GCONV_ILLEGAL_INPUT;				      \
+	  failure = __GCONV_ILLEGAL_INPUT;				      \
 	ch = 0x7b;							      \
 	break;								      \
       case 0xe4:							      \
 	if (var != DE && var != SE && var != SE2)			      \
-	  failure = GCONV_ILLEGAL_INPUT;				      \
+	  failure = __GCONV_ILLEGAL_INPUT;				      \
 	ch = 0x7b;							      \
 	break;								      \
       case 0xe5:							      \
 	if (var != DK && var != NO && var != NO2 && var != SE && var != SE2)  \
-	  failure = GCONV_ILLEGAL_INPUT;				      \
+	  failure = __GCONV_ILLEGAL_INPUT;				      \
 	ch = 0x7d;							      \
 	break;								      \
       case 0xe6:							      \
 	if (var != DK && var != NO && var != NO2)			      \
-	  failure = GCONV_ILLEGAL_INPUT;				      \
+	  failure = __GCONV_ILLEGAL_INPUT;				      \
 	ch = 0x7b;							      \
 	break;								      \
       case 0xe7:							      \
@@ -703,11 +703,11 @@ gconv_end (struct gconv_step *data)
 	else if (var == PT || var == PT2)				      \
 	  ch = 0x7c;							      \
 	else								      \
-	  failure = GCONV_ILLEGAL_INPUT;				      \
+	  failure = __GCONV_ILLEGAL_INPUT;				      \
 	break;								      \
       case 0xe8:							      \
 	if (var != CA && var != CA2 && var != IT && var != FR && var != FR1)  \
-	  failure = GCONV_ILLEGAL_INPUT;				      \
+	  failure = __GCONV_ILLEGAL_INPUT;				      \
 	ch = 0x7d;							      \
 	break;								      \
       case 0xe9:							      \
@@ -718,51 +718,51 @@ gconv_end (struct gconv_step *data)
 	else if (var == SE2)						      \
 	  ch = 0x60;							      \
 	else								      \
-	  failure = GCONV_ILLEGAL_INPUT;				      \
+	  failure = __GCONV_ILLEGAL_INPUT;				      \
 	break;								      \
       case 0xea:							      \
 	if (var != CA && var != CA2)					      \
-	  failure = GCONV_ILLEGAL_INPUT;				      \
+	  failure = __GCONV_ILLEGAL_INPUT;				      \
 	ch = 0x5d;							      \
 	break;								      \
       case 0xec:							      \
 	if (var != IT)							      \
-	  failure = GCONV_ILLEGAL_INPUT;				      \
+	  failure = __GCONV_ILLEGAL_INPUT;				      \
 	ch = 0x7e;							      \
 	break;								      \
       case 0xee:							      \
 	if (var != CA)							      \
-	  failure = GCONV_ILLEGAL_INPUT;				      \
+	  failure = __GCONV_ILLEGAL_INPUT;				      \
 	ch = 0x5e;							      \
 	break;								      \
       case 0xf1:							      \
 	if (var != ES && var != ES2 && var != CU)			      \
-	  failure = GCONV_ILLEGAL_INPUT;				      \
+	  failure = __GCONV_ILLEGAL_INPUT;				      \
 	ch = 0x7c;							      \
 	break;								      \
       case 0xf2:							      \
 	if (var != IT)							      \
-	  failure = GCONV_ILLEGAL_INPUT;				      \
+	  failure = __GCONV_ILLEGAL_INPUT;				      \
 	ch = 0x7c;							      \
 	break;								      \
       case 0xf4:							      \
 	if (var != CA && var != CA2)					      \
-	  failure = GCONV_ILLEGAL_INPUT;				      \
+	  failure = __GCONV_ILLEGAL_INPUT;				      \
 	ch = 0x60;							      \
 	break;								      \
       case 0xf5:							      \
 	if (var != PT && var != PT2)					      \
-	  failure = GCONV_ILLEGAL_INPUT;				      \
+	  failure = __GCONV_ILLEGAL_INPUT;				      \
 	ch = 0x7d;							      \
 	break;								      \
       case 0xf6:							      \
 	if (var != DE && var != HU && var != SE && var != SE2)		      \
-	  failure = GCONV_ILLEGAL_INPUT;				      \
+	  failure = __GCONV_ILLEGAL_INPUT;				      \
 	ch = 0x7c;							      \
 	break;								      \
       case 0xf8:							      \
 	if (var != DK && var != NO && var != NO2)			      \
-	  failure = GCONV_ILLEGAL_INPUT;				      \
+	  failure = __GCONV_ILLEGAL_INPUT;				      \
 	ch = 0x7c;							      \
 	break;								      \
       case 0xf9:							      \
@@ -771,11 +771,11 @@ gconv_end (struct gconv_step *data)
 	else if (var == IT)						      \
 	  ch = 0x60;							      \
 	else								      \
-	  failure = GCONV_ILLEGAL_INPUT;				      \
+	  failure = __GCONV_ILLEGAL_INPUT;				      \
 	break;								      \
       case 0xfb:							      \
 	if (var != CA && var != CA2)					      \
-	  failure = GCONV_ILLEGAL_INPUT;				      \
+	  failure = __GCONV_ILLEGAL_INPUT;				      \
 	ch = 0x7e;							      \
 	break;								      \
       case 0xfc:							      \
@@ -784,95 +784,95 @@ gconv_end (struct gconv_step *data)
 	else if (var == SE2)						      \
 	  ch = 0x7e;							      \
 	else								      \
-	  failure = GCONV_ILLEGAL_INPUT;				      \
+	  failure = __GCONV_ILLEGAL_INPUT;				      \
 	break;								      \
       case 0x160:							      \
 	if (var != YU)							      \
-	  failure = GCONV_ILLEGAL_INPUT;				      \
+	  failure = __GCONV_ILLEGAL_INPUT;				      \
 	ch = 0x5b;							      \
 	break;								      \
       case 0x106:							      \
 	if (var != YU)							      \
-	  failure = GCONV_ILLEGAL_INPUT;				      \
+	  failure = __GCONV_ILLEGAL_INPUT;				      \
 	ch = 0x5d;							      \
 	break;								      \
       case 0x107:							      \
 	if (var != YU)							      \
-	  failure = GCONV_ILLEGAL_INPUT;				      \
+	  failure = __GCONV_ILLEGAL_INPUT;				      \
 	ch = 0x7d;							      \
 	break;								      \
       case 0x10c:							      \
 	if (var != YU)							      \
-	  failure = GCONV_ILLEGAL_INPUT;				      \
+	  failure = __GCONV_ILLEGAL_INPUT;				      \
 	ch = 0x5e;							      \
 	break;								      \
       case 0x10d:							      \
 	if (var != YU)							      \
-	  failure = GCONV_ILLEGAL_INPUT;				      \
+	  failure = __GCONV_ILLEGAL_INPUT;				      \
 	ch = 0x7e;							      \
 	break;								      \
       case 0x110:							      \
 	if (var != YU)							      \
-	  failure = GCONV_ILLEGAL_INPUT;				      \
+	  failure = __GCONV_ILLEGAL_INPUT;				      \
 	ch = 0x5c;							      \
 	break;								      \
       case 0x111:							      \
 	if (var != YU)							      \
-	  failure = GCONV_ILLEGAL_INPUT;				      \
+	  failure = __GCONV_ILLEGAL_INPUT;				      \
 	ch = 0x7c;							      \
 	break;								      \
       case 0x161:							      \
 	if (var != YU)							      \
-	  failure = GCONV_ILLEGAL_INPUT;				      \
+	  failure = __GCONV_ILLEGAL_INPUT;				      \
 	ch = 0x7b;							      \
 	break;								      \
       case 0x17d:							      \
 	if (var != YU)							      \
-	  failure = GCONV_ILLEGAL_INPUT;				      \
+	  failure = __GCONV_ILLEGAL_INPUT;				      \
 	ch = 0x40;							      \
 	break;								      \
       case 0x17e:							      \
 	if (var != YU)							      \
-	  failure = GCONV_ILLEGAL_INPUT;				      \
+	  failure = __GCONV_ILLEGAL_INPUT;				      \
 	ch = 0x60;							      \
 	break;								      \
       case 0x2dd:							      \
 	if (var != HU)							      \
-	  failure = GCONV_ILLEGAL_INPUT;				      \
+	  failure = __GCONV_ILLEGAL_INPUT;				      \
 	ch = 0x7e;							      \
 	break;								      \
       case 0x2022:							      \
 	if (var != ES2)							      \
-	  failure = GCONV_ILLEGAL_INPUT;				      \
+	  failure = __GCONV_ILLEGAL_INPUT;				      \
 	ch = 0x40;							      \
 	break;								      \
       case 0x203e:							      \
 	if (var != GB && var != CN && var != JP && var != NO && var != SE)    \
-	  failure = GCONV_ILLEGAL_INPUT;				      \
+	  failure = __GCONV_ILLEGAL_INPUT;				      \
 	ch = 0x7e;							      \
 	break;								      \
       case 0x20a9:							      \
 	if (var != KR)							      \
-	  failure = GCONV_ILLEGAL_INPUT;				      \
+	  failure = __GCONV_ILLEGAL_INPUT;				      \
 	ch = 0x5c;							      \
 	break;								      \
       case 0x2329:							      \
 	if (var != JP_OCR_B)						      \
-	  failure = GCONV_ILLEGAL_INPUT;				      \
+	  failure = __GCONV_ILLEGAL_INPUT;				      \
 	ch = 0x5b;							      \
 	break;								      \
       case 0x232a:							      \
 	if (var != JP_OCR_B)						      \
-	  failure = GCONV_ILLEGAL_INPUT;				      \
+	  failure = __GCONV_ILLEGAL_INPUT;				      \
 	ch = 0x5d;							      \
 	break;								      \
       default:								      \
 	if (*((uint32_t *) inptr) > 0x7f)				      \
-	  failure = GCONV_ILLEGAL_INPUT;				      \
+	  failure = __GCONV_ILLEGAL_INPUT;				      \
 	break;								      \
       }									      \
 									      \
-    if (failure == GCONV_ILLEGAL_INPUT)					      \
+    if (failure == __GCONV_ILLEGAL_INPUT)				      \
       {									      \
 	/* Exit the loop with an error.  */				      \
 	result = failure;						      \