Update.

1999-06-18  Thorsten Kukuk  <kukuk@suse.de>

	* sysdeps/alpha/atomicity.h: Correct counting of subsections.

1999-06-17  Andreas Schwab  <schwab@issan.cs.uni-dortmund.de>

	* stdlib/tst-strtoll.c: Avoid warning about huge constant.

1999-06-20  Andreas Schwab  <schwab@issan.cs.uni-dortmund.de>

	* stdio-common/vfprintf.c (group_member): Make parameters and
	return types pointers to CHAR_T instead of UCHAR_T.
	(vfprintf): Change type of work_buffer, workend and string to
	CHAR_T pointer/array.
	(process_arg, process_string_arg): Adjust/remove casts.  Add
	missing use of L_ macro.
	(printf_unknown): Add missing uses of L_ macro.

1999-06-20  Andreas Schwab  <schwab@issan.cs.uni-dortmund.de>

	* wcsmbs/wcschrnul.c: Explicitly cast return value to avoid
	warning.

1999-06-20  Andreas Schwab  <schwab@issan.cs.uni-dortmund.de>

	* libio/wgenops.c (__wuflow): Fix use of WEOF vs. EOF.  Call
	_IO_switch_to_wget_mode instead of _IO_switch_to_get_mode.
	(__wunderflow): Likewise.
	(_IO_switch_to_wget_mode): Likewise.
	(_IO_init_wmarker): Likewise.

	* libio/wfileops.c (_IO_wfile_seekoff): Call
	_IO_switch_to_wget_mode, not _IO_switch_to_get_mode.
	(_IO_wfile_jumps): Fix pbackfail entry.

	* libio/iosetvbuf.c (_IO_setvbuf): Only call wide char setbuf
	function if the stream is currently unoriented.

1999-06-19  Zack Weinberg  <zack@rabi.columbia.edu>

	* wcsmbs/wchar.h: Define __need___va_list before including stdarg.h.
	Wrap all wide stream functions with #ifdef __USE_ISOC9X.  Use
	__gnuc_va_list in v*w(printf|scanf) prototypes.

1999-06-20  Andreas Jaeger  <aj@arthur.rhein-neckar.de>

	* libio/oldiopopen.c (_IO_old_proc_open): Apply change from
	1999-03-29 to iopopen also here.
	Reported by Richard Braakman <dark@xs4all.nl>.

1999-06-20  Andreas Jaeger  <aj@arthur.rhein-neckar.de>

	* include/features.h: Use __GNUC_PREREQ.
	* sysdeps/i386/fpu/bits/mathinline.h: Likewise

1999-06-19  Andreas Schwab  <schwab@issan.cs.uni-dortmund.de>

	* stdio-common/vfscanf.c (ungetc, inchar) [COMPILE_WPRINTF]:
	Change EOF to WEOF and remove cast.
	(UNGETC): Remove macro.
	(_IO_vfwscanf): Change isspace to ISSPACE and UNGETC to ungetc.
	* stdio-common/printf-parse.h (find_spec) [!COMPILE_WPRINTF]:
	Change ISASCII to isascii and MBRLEN to mbrlen.
	(parse_one_spec): Compare info.spec always against wchar_t
	values.
	* stdio-common/vfprintf.c: Remove unused ISASCII and MBRLEN.
	(_itoa, _itoa_word) [COMPILE_WRPINTF]: Don't cast second argument.
	(NOT_IN_JUMP_RANGE, CHAR_CLASS): Change (int) to (INT_T), use L_.

1999-06-19  Andreas Schwab  <schwab@issan.cs.uni-dortmund.de>

	* libio/Makefile (shared-only-routines): Add oldiofgetpos,
	oldiofgetpos64, oldiofsetpos and oldiofsetpos64.
	(routines): Include oldiofgetpos, oldiofgetpos64, oldiofsetpos and
	oldiofsetpos64 only if doing versioning.

15 files changed, 194 insertions, 120 deletions

diff --git a/ChangeLog b/ChangeLog
index e1acc35474..db8537512f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,79 @@
+1999-06-18  Thorsten Kukuk  <kukuk@suse.de>
+
+	* sysdeps/alpha/atomicity.h: Correct counting of subsections.
+
+1999-06-17  Andreas Schwab  <schwab@issan.cs.uni-dortmund.de>
+
+	* stdlib/tst-strtoll.c: Avoid warning about huge constant.
+
+1999-06-20  Andreas Schwab  <schwab@issan.cs.uni-dortmund.de>
+
+	* stdio-common/vfprintf.c (group_member): Make parameters and
+	return types pointers to CHAR_T instead of UCHAR_T.
+	(vfprintf): Change type of work_buffer, workend and string to
+	CHAR_T pointer/array.
+	(process_arg, process_string_arg): Adjust/remove casts.  Add
+	missing use of L_ macro.
+	(printf_unknown): Add missing uses of L_ macro.
+
+1999-06-20  Andreas Schwab  <schwab@issan.cs.uni-dortmund.de>
+
+	* wcsmbs/wcschrnul.c: Explicitly cast return value to avoid
+	warning.
+
+1999-06-20  Andreas Schwab  <schwab@issan.cs.uni-dortmund.de>
+
+	* libio/wgenops.c (__wuflow): Fix use of WEOF vs. EOF.  Call
+	_IO_switch_to_wget_mode instead of _IO_switch_to_get_mode.
+	(__wunderflow): Likewise.
+	(_IO_switch_to_wget_mode): Likewise.
+	(_IO_init_wmarker): Likewise.
+
+	* libio/wfileops.c (_IO_wfile_seekoff): Call
+	_IO_switch_to_wget_mode, not _IO_switch_to_get_mode.
+	(_IO_wfile_jumps): Fix pbackfail entry.
+
+	* libio/iosetvbuf.c (_IO_setvbuf): Only call wide char setbuf
+	function if the stream is currently unoriented.
+
+1999-06-19  Zack Weinberg  <zack@rabi.columbia.edu>
+
+	* wcsmbs/wchar.h: Define __need___va_list before including stdarg.h.
+	Wrap all wide stream functions with #ifdef __USE_ISOC9X.  Use
+	__gnuc_va_list in v*w(printf|scanf) prototypes.
+
+1999-06-20  Andreas Jaeger  <aj@arthur.rhein-neckar.de>
+
+	* libio/oldiopopen.c (_IO_old_proc_open): Apply change from
+	1999-03-29 to iopopen also here.
+	Reported by Richard Braakman <dark@xs4all.nl>.
+
+1999-06-20  Andreas Jaeger  <aj@arthur.rhein-neckar.de>
+
+	* include/features.h: Use __GNUC_PREREQ.
+	* sysdeps/i386/fpu/bits/mathinline.h: Likewise
+
+1999-06-19  Andreas Schwab  <schwab@issan.cs.uni-dortmund.de>
+
+	* stdio-common/vfscanf.c (ungetc, inchar) [COMPILE_WPRINTF]:
+	Change EOF to WEOF and remove cast.
+	(UNGETC): Remove macro.
+	(_IO_vfwscanf): Change isspace to ISSPACE and UNGETC to ungetc.
+	* stdio-common/printf-parse.h (find_spec) [!COMPILE_WPRINTF]:
+	Change ISASCII to isascii and MBRLEN to mbrlen.
+	(parse_one_spec): Compare info.spec always against wchar_t
+	values.
+	* stdio-common/vfprintf.c: Remove unused ISASCII and MBRLEN.
+	(_itoa, _itoa_word) [COMPILE_WRPINTF]: Don't cast second argument.
+	(NOT_IN_JUMP_RANGE, CHAR_CLASS): Change (int) to (INT_T), use L_.
+
+1999-06-19  Andreas Schwab  <schwab@issan.cs.uni-dortmund.de>
+
+	* libio/Makefile (shared-only-routines): Add oldiofgetpos,
+	oldiofgetpos64, oldiofsetpos and oldiofsetpos64.
+	(routines): Include oldiofgetpos, oldiofgetpos64, oldiofsetpos and
+	oldiofsetpos64 only if doing versioning.
+
 1999-06-20  Ulrich Drepper  <drepper@cygnus.com>
 
 	* wcsmbs/wchar.h: Declare wcstof and wcstold for ISO C9x.
diff --git a/include/features.h b/include/features.h
index de2b143b60..88be470025 100644
--- a/include/features.h
+++ b/include/features.h
@@ -272,8 +272,7 @@
 #endif	/* !ASSEMBLER */
 
 /* Decide whether we can define 'extern inline' functions in headers.  */
-#if defined __GNUC__ && (__GNUC__ > 2 || __GNUC__ == 2 && __GNUC_MINOR__ >= 7)\
-    && defined __OPTIMIZE__ && !defined __OPTIMIZE_SIZE__
+#if __GNUC_PREREQ (2, 7) && defined __OPTIMIZE__ && !defined __OPTIMIZE_SIZE__
 # define __USE_EXTERN_INLINES	1
 #endif
 
diff --git a/libio/Makefile b/libio/Makefile
index 6fcde40814..6759b84f1d 100644
--- a/libio/Makefile
+++ b/libio/Makefile
@@ -30,7 +30,6 @@ routines	:=							      \
 	ioseekoff ioseekpos iosetbuffer iosetvbuf iosprintf ioungetc	      \
 	iovsprintf iovsscanf						      \
 	iofgetpos64 iofopen64 iofsetpos64				      \
-	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    \
@@ -51,7 +50,8 @@ include ../Makeconfig
 
 ifeq ($(versioning),yes)
 routines += oldiofopen oldiofdopen oldiofclose oldiopopen oldpclose \
-	    oldtmpfile
+	    oldtmpfile oldiofgetpos oldiofgetpos64 oldiofsetpos	    \
+	    oldiofsetpos64
 endif
 
 ifneq (,$(filter %REENTRANT, $(defines)))
@@ -69,7 +69,9 @@ aux	+= oldfileops oldstdfiles
 endif
 
 shared-only-routines = oldiofopen oldiofdopen oldiofclose oldfileops	\
-		       oldstdfiles oldiopopen oldpclose oldtmpfile
+		       oldstdfiles oldiopopen oldpclose oldtmpfile	\
+		       oldiofgetpos oldiofgetpos64 oldiofsetpos		\
+		       oldiofsetpos64
 
 distribute := iolibio.h libioP.h strfile.h Banner
 
diff --git a/libio/iosetvbuf.c b/libio/iosetvbuf.c
index b9ef31a278..5dc5eedffe 100644
--- a/libio/iosetvbuf.c
+++ b/libio/iosetvbuf.c
@@ -90,7 +90,7 @@ _IO_setvbuf (fp, buf, mode, size)
       goto unlock_return;
     }
   result = _IO_SETBUF (fp, buf, size) == NULL ? EOF : 0;
-  if (result == 0 && fp->_mode > 0)
+  if (result == 0 && fp->_mode == 0)
     /* We also have to set the buffer using the wide char function.  */
     result = ((*fp->_wide_data->_wide_vtable->__setbuf) (fp, buf, size) == NULL
 	      ? EOF : 0);
diff --git a/libio/oldiopopen.c b/libio/oldiopopen.c
index c4116baae3..556a9ff86f 100644
--- a/libio/oldiopopen.c
+++ b/libio/oldiopopen.c
@@ -140,6 +140,8 @@ _IO_old_proc_open (fp, command, mode)
   if (child_pid == 0)
     {
       int child_std_end = mode[0] == 'r' ? 1 : 0;
+      struct _IO_proc_file *p;
+      
       _IO_close (parent_end);
       if (child_end != child_std_end)
 	{
@@ -149,11 +151,8 @@ _IO_old_proc_open (fp, command, mode)
       /* POSIX.2:  "popen() shall ensure that any streams from previous
          popen() calls that remain open in the parent process are closed
 	 in the new child process." */
-      while (old_proc_file_chain)
-	{
-	  _IO_close (_IO_fileno ((_IO_FILE *) old_proc_file_chain));
-	  old_proc_file_chain = old_proc_file_chain->next;
-	}
+      for (p = old_proc_file_chain; p; p = p->next)
+	_IO_close (_IO_fileno ((_IO_FILE *) p));
 
       _IO_execl ("/bin/sh", "sh", "-c", command, (char *) 0);
       _IO__exit (127);
diff --git a/libio/wfileops.c b/libio/wfileops.c
index b040b97491..f3f8bf25dd 100644
--- a/libio/wfileops.c
+++ b/libio/wfileops.c
@@ -421,7 +421,7 @@ _IO_wfile_seekoff (fp, offset, dir, mode)
 
   if (fp->_wide_data->_IO_write_ptr > fp->_wide_data->_IO_write_base
       || _IO_in_put_mode (fp))
-    if (_IO_switch_to_get_mode (fp))
+    if (_IO_switch_to_wget_mode (fp))
       return WEOF;
 
   if (fp->_wide_data->_IO_buf_base == NULL)
@@ -698,7 +698,7 @@ struct _IO_jump_t _IO_wfile_jumps =
   JUMP_INIT(overflow, (_IO_overflow_t) _IO_wfile_overflow),
   JUMP_INIT(underflow, (_IO_underflow_t) _IO_wfile_underflow),
   JUMP_INIT(uflow, (_IO_underflow_t) _IO_wdefault_uflow),
-  JUMP_INIT(pbackfail, _IO_default_pbackfail),
+  JUMP_INIT(pbackfail, (_IO_pbackfail_t) _IO_wdefault_pbackfail),
   JUMP_INIT(xsputn, _IO_wfile_xsputn),
   JUMP_INIT(xsgetn, _IO_file_xsgetn),
   JUMP_INIT(seekoff, _IO_wfile_seekoff),
diff --git a/libio/wgenops.c b/libio/wgenops.c
index 496d080014..6144a1014e 100644
--- a/libio/wgenops.c
+++ b/libio/wgenops.c
@@ -239,12 +239,12 @@ __wuflow (fp)
      _IO_FILE *fp;
 {
   if (fp->_mode < 0 || (fp->_mode == 0 && _IO_fwide (fp, 1) != 1))
-    return EOF;
+    return WEOF;
 
   if (fp->_mode == 0)
     _IO_fwide (fp, 1);
   if (_IO_in_put_mode (fp))
-    if (_IO_switch_to_get_mode (fp) == EOF)
+    if (_IO_switch_to_wget_mode (fp) == EOF)
       return WEOF;
   if (fp->_wide_data->_IO_read_ptr < fp->_wide_data->_IO_read_end)
     return *fp->_wide_data->_IO_read_ptr++;
@@ -270,10 +270,10 @@ __wunderflow (fp)
      _IO_FILE *fp;
 {
   if (fp->_mode < 0 || (fp->_mode == 0 && _IO_fwide (fp, 1) != 1))
-    return EOF;
+    return WEOF;
 
   if (_IO_in_put_mode (fp))
-    if (_IO_switch_to_wget_mode (fp) == WEOF)
+    if (_IO_switch_to_wget_mode (fp) == EOF)
       return WEOF;
   if (fp->_wide_data->_IO_read_ptr < fp->_wide_data->_IO_read_end)
     return *fp->_wide_data->_IO_read_ptr;
@@ -286,7 +286,7 @@ __wunderflow (fp)
   if (_IO_have_markers (fp))
     {
       if (save_for_wbackup (fp, fp->_wide_data->_IO_read_end))
-	return EOF;
+	return WEOF;
     }
   else if (_IO_have_backup (fp))
     _IO_free_wbackup_area (fp);
@@ -447,7 +447,7 @@ _IO_switch_to_wget_mode (fp)
      _IO_FILE *fp;
 {
   if (fp->_wide_data->_IO_write_ptr > fp->_wide_data->_IO_write_base)
-    if (_IO_OVERFLOW (fp, EOF) == EOF)
+    if (_IO_OVERFLOW (fp, WEOF) == WEOF)
       return EOF;
   if (_IO_in_backup (fp))
     fp->_wide_data->_IO_read_base = fp->_wide_data->_IO_backup_base;
@@ -663,7 +663,7 @@ _IO_init_wmarker (marker, fp)
 {
   marker->_sbuf = fp;
   if (_IO_in_put_mode (fp))
-    _IO_switch_to_get_mode (fp);
+    _IO_switch_to_wget_mode (fp);
   if (_IO_in_backup (fp))
     marker->_pos = fp->_wide_data->_IO_read_ptr - fp->_wide_data->_IO_read_end;
   else
diff --git a/stdio-common/printf-parse.h b/stdio-common/printf-parse.h
index d62f3a835e..a8cb0345c3 100644
--- a/stdio-common/printf-parse.h
+++ b/stdio-common/printf-parse.h
@@ -106,7 +106,7 @@ find_spec (const UCHAR_T *format, mbstate_t *ps)
 
       /* Remove any hints of a wrong encoding.  */
       ps->count = 0;
-      if (! ISASCII (*format) && (len = MBRLEN (format, MB_CUR_MAX, ps)) > 0)
+      if (! isascii (*format) && (len = mbrlen (format, MB_CUR_MAX, ps)) > 0)
 	format += len;
       else
 	++format;
@@ -355,12 +355,12 @@ parse_one_spec (const UCHAR_T *format, size_t posn, struct printf_spec *spec,
 
       switch (spec->info.spec)
 	{
-	case L_('i'):
-	case L_('d'):
-	case L_('u'):
-	case L_('o'):
-	case L_('X'):
-	case L_('x'):
+	case L'i':
+	case L'd':
+	case L'u':
+	case L'o':
+	case L'X':
+	case L'x':
 #if LONG_MAX != LONG_LONG_MAX
 	  if (spec->info.is_long_double)
 	    spec->data_arg_type = PA_INT|PA_FLAG_LONG_LONG;
@@ -375,38 +375,38 @@ parse_one_spec (const UCHAR_T *format, size_t posn, struct printf_spec *spec,
 	    else
 	      spec->data_arg_type = PA_INT;
 	  break;
-	case L_('e'):
-	case L_('E'):
-	case L_('f'):
-	case L_('g'):
-	case L_('G'):
-	case L_('a'):
-	case L_('A'):
+	case L'e':
+	case L'E':
+	case L'f':
+	case L'g':
+	case L'G':
+	case L'a':
+	case L'A':
 	  if (spec->info.is_long_double)
 	    spec->data_arg_type = PA_DOUBLE|PA_FLAG_LONG_DOUBLE;
 	  else
 	    spec->data_arg_type = PA_DOUBLE;
 	  break;
-	case L_('c'):
+	case L'c':
 	  spec->data_arg_type = PA_CHAR;
 	  break;
-	case L_('C'):
+	case L'C':
 	  spec->data_arg_type = PA_WCHAR;
 	  break;
-	case L_('s'):
+	case L's':
 	  spec->data_arg_type = PA_STRING;
 	  break;
-	case L_('S'):
+	case L'S':
 	  spec->data_arg_type = PA_WSTRING;
 	  break;
-	case L_('p'):
+	case L'p':
 	  spec->data_arg_type = PA_POINTER;
 	  break;
-	case L_('n'):
+	case L'n':
 	  spec->data_arg_type = PA_INT|PA_FLAG_PTR;
 	  break;
 
-	case L_('m'):
+	case L'm':
 	default:
 	  /* An unknown spec will consume no args.  */
 	  spec->ndata_args = 0;
diff --git a/stdio-common/vfprintf.c b/stdio-common/vfprintf.c
index fe145d6a3d..a65953d305 100644
--- a/stdio-common/vfprintf.c
+++ b/stdio-common/vfprintf.c
@@ -70,8 +70,6 @@
 #  define INT_T		int
 #  define L_(Str)	Str
 #  define ISDIGIT(Ch)	isdigit (Ch)
-#  define ISASCII(Ch)	isascii (Ch)
-#  define MBRLEN(Cp, L, St) mbrlen (Cp, L, St)
 
 #  define PUT(F, S, N)	_IO_sputn ((F), (S), (N))
 #  define PAD(Padchar) \
@@ -89,8 +87,6 @@
 #  define INT_T		wint_t
 #  define L_(Str)	L##Str
 #  define ISDIGIT(Ch)	iswdigit (Ch)
-#  define ISASCII(Ch)	(((unsigned int) (Ch) & ~0x7f) == 0)
-#  define MBRLEN(Cp, L, St) wcslen ((const wchar_t *) (Cp))
 
 #  define PUT(F, S, N)	_IO_sputn ((F), (S), (N))
 #  define PAD(Padchar) \
@@ -99,9 +95,8 @@
 #  define PUTC(C, F)	_IO_putwc_unlocked (C, F)
 #  define ORIENT	if (_IO_fwide (s, 1) != 1) return -1
 
-#  define _itoa(Val, Buf, Base, Case) _itowa (Val, (wchar_t *) Buf, Base, Case)
-#  define _itoa_word(Val, Buf, Base, Case) _itowa_word (Val, (wchar_t *) Buf, \
-							Base, Case)
+#  define _itoa(Val, Buf, Base, Case) _itowa (Val, Buf, Base, Case)
+#  define _itoa_word(Val, Buf, Base, Case) _itowa_word (Val, Buf, Base, Case)
 #  undef EOF
 #  define EOF WEOF
 # endif
@@ -199,8 +194,7 @@ static int printf_unknown __P ((FILE *, const struct printf_info *,
 				const void *const *));
 
 /* Group digits of number string.  */
-static UCHAR_T *group_number __P ((UCHAR_T *, UCHAR_T *, const char *,
-				   wchar_t))
+static CHAR_T *group_number __P ((CHAR_T *, CHAR_T *, const char *, wchar_t))
      internal_function;
 
 
@@ -227,8 +221,8 @@ vfprintf (FILE *s, const CHAR_T *format, va_list ap)
   const UCHAR_T *end_of_spec;
 
   /* Buffer intermediate results.  */
-  UCHAR_T work_buffer[1000];
-  UCHAR_T *workend;
+  CHAR_T work_buffer[1000];
+  CHAR_T *workend;
 
   /* State for restartable multibyte character handling functions.  */
 #ifndef COMPILE_WPRINTF
@@ -275,8 +269,8 @@ vfprintf (FILE *s, const CHAR_T *format, va_list ap)
     /* 'x' */ 18,            0, /* 'z' */ 13
   };
 
-#define NOT_IN_JUMP_RANGE(Ch) ((Ch) < ' ' || (Ch) > 'z')
-#define CHAR_CLASS(Ch) (jump_table[(int) (Ch) - ' '])
+#define NOT_IN_JUMP_RANGE(Ch) ((Ch) < L_(' ') || (Ch) > L_('z'))
+#define CHAR_CLASS(Ch) (jump_table[(INT_T) (Ch) - L_(' ')])
 #define JUMP(ChExpr, table)						      \
       do								      \
 	{								      \
@@ -593,8 +587,8 @@ vfprintf (FILE *s, const CHAR_T *format, va_list ap)
 	  else								      \
 	    {								      \
 	      /* Put the number in WORK.  */				      \
-	      string = (UCHAR_T *) _itoa (number.longlong, workend + 1, base, \
-					  spec == L_('X'));		      \
+	      string = _itoa (number.longlong, workend + 1, base,	      \
+			      spec == L_('X'));				      \
 	      string -= 1;						      \
 	      if (group && grouping)					      \
 		string = group_number (string, workend, grouping,	      \
@@ -647,8 +641,8 @@ vfprintf (FILE *s, const CHAR_T *format, va_list ap)
 	  else								      \
 	    {								      \
 	      /* Put the number in WORK.  */				      \
-	      string = (UCHAR_T *) _itoa_word (number.word, workend + 1,      \
-					       base, spec == L_('X'));	      \
+	      string = _itoa_word (number.word, workend + 1, base,	      \
+				   spec == L_('X'));			      \
 	      string -= 1;						      \
 	      if (group && grouping)					      \
 		string = group_number (string, workend, grouping,	      \
@@ -858,13 +852,13 @@ vfprintf (FILE *s, const CHAR_T *format, va_list ap)
 	    is_negative = 0;						      \
 	    alt = 1;							      \
 	    group = 0;							      \
-	    spec = 'x';							      \
+	    spec = L_('x');						      \
 	    goto LABEL (number);					      \
 	  }								      \
 	else								      \
 	  {								      \
 	    /* Write "(nil)" for a nil pointer.  */			      \
-	    string = (UCHAR_T *) L_("(nil)");				      \
+	    string = (CHAR_T *) L_("(nil)");	 			      \
 	    /* Make sure the full string "(nil)" is printed.  */	      \
 	    if (prec < 5)						      \
 	      prec = 5;							      \
@@ -901,8 +895,8 @@ vfprintf (FILE *s, const CHAR_T *format, va_list ap)
     LABEL (form_strerror):						      \
       /* Print description of error ERRNO.  */				      \
       string =								      \
-	(UCHAR_T *) __strerror_r (save_errno, (char *) work_buffer,	      \
-				  sizeof work_buffer);			      \
+	(CHAR_T *) __strerror_r (save_errno, (char *) work_buffer,	      \
+				 sizeof work_buffer);			      \
       is_long = 0;		/* This is no wide-char string.  */	      \
       goto LABEL (print_string)
 
@@ -945,9 +939,9 @@ vfprintf (FILE *s, const CHAR_T *format, va_list ap)
 	/* The string argument could in fact be `char *' or `wchar_t *'.      \
 	   But this should not make a difference here.  */		      \
 	if (fspec == NULL)						      \
-	  string = (UCHAR_T *) va_arg (ap, const wchar_t *);		      \
+	  string = (CHAR_T *) va_arg (ap, const wchar_t *);		      \
 	else								      \
-	  string = (UCHAR_T *) args_value[fspec->data_arg].pa_wstring;	      \
+	  string = (CHAR_T *) args_value[fspec->data_arg].pa_wstring;	      \
 									      \
 	/* Entry point for printing other strings.  */			      \
       LABEL (print_string):						      \
@@ -958,12 +952,12 @@ vfprintf (FILE *s, const CHAR_T *format, va_list ap)
 	    if (prec == -1						      \
 		|| prec >= (int) (sizeof (null) / sizeof (null[0])) - 1)      \
 	      {								      \
-		string = (UCHAR_T *) null;				      \
+		string = (CHAR_T *) null;				      \
 		len = (sizeof (null) / sizeof (null[0])) - 1;		      \
 	      }								      \
 	    else							      \
 	      {								      \
-		string = (UCHAR_T *) L"";				      \
+		string = (CHAR_T *) L"";				      \
 		len = 0;						      \
 	      }								      \
 	  }								      \
@@ -978,10 +972,10 @@ vfprintf (FILE *s, const CHAR_T *format, va_list ap)
 									      \
 	    /* Allocate dynamically an array which definitely is long	      \
 	       enough for the wide character version.  */		      \
-	    string = (UCHAR_T *) alloca ((len + 1) * sizeof (wchar_t));	      \
+	    string = (CHAR_T *) alloca ((len + 1) * sizeof (wchar_t));	      \
 									      \
 	    memset (&mbstate, '\0', sizeof (mbstate_t));		      \
-	    len = __mbsrtowcs ((wchar_t *) string, &mbs, len + 1, &mbstate);  \
+	    len = __mbsrtowcs (string, &mbs, len + 1, &mbstate);	      \
 	    if (len == (size_t) -1)					      \
 	      {								      \
 		/* Illegal multibyte character.  */			      \
@@ -994,9 +988,9 @@ vfprintf (FILE *s, const CHAR_T *format, va_list ap)
 	    if (prec != -1)						      \
 	      /* Search for the end of the string, but don't search past      \
 		 the length specified by the precision.  */		      \
-	      len = __wcsnlen ((wchar_t *) string, prec);		      \
+	      len = __wcsnlen (string, prec);				      \
 	    else							      \
-	      len = __wcslen ((wchar_t *) string);			      \
+	      len = __wcslen (string);					      \
 	  }								      \
 									      \
 	if ((width -= len) < 0)						      \
@@ -1199,7 +1193,7 @@ vfprintf (FILE *s, cons