From e0ea35832e9039a89809102688e57a1040587b87 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Wed, 25 Apr 2001 20:50:21 +0000 Subject: Update. 2001-04-25 Jakub Jelinek * 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 * sysdeps/unix/sysv/linux/sparc/sparc64/get_clockfreq.c: New file. --- manual/charset.texi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'manual/charset.texi') 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"); -- cgit v1.2.3