Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. =================================================================== RCS file: /ftp/cvs/cvsroot/src/include/wchar.h,v rcsdiff: /ftp/cvs/cvsroot/src/include/wchar.h,v: warning: Unknown phrases like `commitid ...;' are present. retrieving revision 1.21.2.1 retrieving revision 1.27.10.2 diff -u -p -r1.21.2.1 -r1.27.10.2 --- src/include/wchar.h 2005/04/06 13:39:05 1.21.2.1 +++ src/include/wchar.h 2008/04/28 20:22:55 1.27.10.2 @@ -1,4 +1,4 @@ -/* $NetBSD: wchar.h,v 1.21.2.1 2005/04/06 13:39:05 tron Exp $ */ +/* $NetBSD: wchar.h,v 1.27.10.2 2008/04/28 20:22:55 martin Exp $ */ /*- * Copyright (c)1999 Citrus Project, @@ -41,13 +41,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the NetBSD - * Foundation, Inc. and its contributors. - * 4. Neither the name of The NetBSD Foundation nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED @@ -146,6 +139,9 @@ double wcstod(const wchar_t * __restrict #if defined(_ISOC99_SOURCE) || (__STDC_VERSION__ - 0) > 199901L || \ defined(_NETBSD_SOURCE) +float wcstof(const wchar_t * __restrict, wchar_t ** __restrict); +long double wcstold(const wchar_t * __restrict, wchar_t ** __restrict); + /* LONGLONG */ long long int wcstoll(const wchar_t * __restrict, wchar_t ** __restrict, int); @@ -165,6 +161,33 @@ wint_t putwc(wchar_t, FILE *); wint_t putwchar(wchar_t); int fwide(FILE *, int); + +wchar_t *fgetwln(FILE * __restrict, size_t * __restrict); +int fwprintf(FILE * __restrict, const wchar_t * __restrict, ...); +int fwscanf(FILE * __restrict, const wchar_t * __restrict, ...); +int swprintf(wchar_t * __restrict, size_t n, const wchar_t * __restrict, ...); +int swscanf(const wchar_t * __restrict, const wchar_t * __restrict, ...); +int vfwprintf(FILE * __restrict, const wchar_t * __restrict, _BSD_VA_LIST_); +int vswprintf(wchar_t * __restrict, size_t, const wchar_t * __restrict, + _BSD_VA_LIST_); +int vwprintf(const wchar_t * __restrict, _BSD_VA_LIST_); +int wprintf(const wchar_t * __restrict, ...); +int wscanf(const wchar_t * __restrict, ...); +#if defined(_ISOC99_SOURCE) || (__STDC_VERSION__ - 0) > 199901L || \ + defined(_NETBSD_SOURCE) +int vfwscanf(FILE * __restrict, const wchar_t * __restrict, _BSD_VA_LIST_); +int vswscanf(const wchar_t * __restrict, const wchar_t * __restrict, + _BSD_VA_LIST_); +int vwscanf(const wchar_t * __restrict, _BSD_VA_LIST_); +#endif +#if defined(_NETBSD_SOURCE) +struct tinfo; +int t_putws(struct tinfo *, const wchar_t *, int, void (*)(wchar_t, void *), + void *); +wchar_t *wcsdup (const wchar_t *); +int wcsncasecmp (const wchar_t *, const wchar_t *, size_t); +int wcscasecmp(const wchar_t *, const wchar_t *); +#endif __END_DECLS #ifndef WEOF