summary refs log tree commit diff
path: root/manual
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2001-04-25 20:50:21 +0000
committerUlrich Drepper <drepper@redhat.com>2001-04-25 20:50:21 +0000
commite0ea35832e9039a89809102688e57a1040587b87 (patch)
tree6b856a602d9677cfb6e92ea8f7312fb3396bbed0 /manual
parentc5e38fac45176848d71f91eb01daa23c6f1a9886 (diff)
downloadglibc-e0ea35832e9039a89809102688e57a1040587b87.tar.gz
glibc-e0ea35832e9039a89809102688e57a1040587b87.tar.xz
glibc-e0ea35832e9039a89809102688e57a1040587b87.zip
Update.
2001-04-25  Jakub Jelinek  <jakub@redhat.com>

	* sysdeps/unix/sysv/linux/sparc/sparc64/bits/time.h: Move to...
	* sysdeps/unix/sysv/linux/sparc/bits/time.h: ...here.
	* sysdeps/unix/sysv/linux/sparc/sparc32/sparcv9/bits/time.h: Remove.
	* sysdeps/unix/sysv/linux/sparc/sparc64/bits/socket.h: Move to...
	* sysdeps/unix/sysv/linux/sparc/bits/socket.h: ...here.  Adjust
	struct msghdr for __WORDSIZE == 32.
	* sysdeps/unix/sysv/linux/sparc/sparc64/bits/statvfs.h: Move to...
	* sysdeps/unix/sysv/linux/sparc/bits/statvfs.h: ...here. Adjust
	for __WORDSIZE == 32.
	* sysdeps/unix/sysv/linux/sparc/sparc64/bits/siginfo.h: Remove.
	* sysdeps/unix/sysv/linux/sparc/sparc32/sparcv9/get_clockfreq.c: New
	file.
	* sysdeps/unix/sysv/linux/sparc/sparc64/longjmp.S (__libc_siglongjmp):
	Rename from longjmp, make longjmp weak alias to it.

2001-04-24  David S. Miller  <davem@redhat.com>

	* sysdeps/unix/sysv/linux/sparc/sparc64/get_clockfreq.c: New file.
Diffstat (limited to 'manual')
-rw-r--r--manual/charset.texi4
1 files changed, 2 insertions, 2 deletions
diff --git a/manual/charset.texi b/manual/charset.texi
index d0286afda9..de420ea8a5 100644
--- a/manual/charset.texi
+++ b/manual/charset.texi
@@ -1821,12 +1821,12 @@ file2wcs (int fd, const char *charset, wchar_t *outbuf, size_t avail)
   int result = 0;
   iconv_t cd;
 
-  cd = iconv_open ("UCS-4", charset);
+  cd = iconv_open ("WCHAR_T", charset);
   if (cd == (iconv_t) -1)
     @{
       /* @r{Something went wrong.}  */
       if (errno == EINVAL)
-        error (0, 0, "conversion from '%s' to 'UCS-4' not available",
+        error (0, 0, "conversion from '%s' to wchar_t not available",
                charset);
       else
         perror ("iconv_open");