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.5
retrieving revision 1.18
diff -u -p -r1.5 -r1.18
--- src/include/wchar.h	2000/12/21 08:30:52	1.5
+++ src/include/wchar.h	2003/04/28 23:16:15	1.18
@@ -1,4 +1,4 @@
-/*	$NetBSD: wchar.h,v 1.5 2000/12/21 08:30:52 itojun Exp $	*/
+/*	$NetBSD: wchar.h,v 1.18 2003/04/28 23:16:15 bjh21 Exp $	*/
 
 /*-
  * Copyright (c)1999 Citrus Project,
@@ -66,9 +66,12 @@
 #define _WCHAR_H_
 
 #include <sys/cdefs.h>
+#include <sys/featuretest.h>
 #include <machine/ansi.h>
 #include <sys/null.h>
 
+#include <stdio.h> /* for FILE* */
+
 #ifdef	_BSD_WCHAR_T_
 typedef	_BSD_WCHAR_T_	wchar_t;
 #undef	_BSD_WCHAR_T_
@@ -93,27 +96,82 @@ typedef	_BSD_SIZE_T_	size_t;
 #define	WEOF 	((wint_t)-1)
 #endif
 
+#define getwc(f) fgetwc(f)
+#define getwchar() getwc(stdin)
+#define putwc(wc, f) fputwc((wc), (f))
+#define putwchar(wc) putwc((wc), stdout)
+
 __BEGIN_DECLS
-wchar_t	*wcscat __P((wchar_t *, const wchar_t *));
+wint_t	btowc __P((int));
+size_t	mbrlen __P((const char * __restrict, size_t, mbstate_t * __restrict));
+size_t	mbrtowc __P((wchar_t * __restrict, const char * __restrict, size_t,
+	    mbstate_t * __restrict));
+int	mbsinit __P((const mbstate_t *));
+size_t	mbsrtowcs __P((wchar_t * __restrict, const char ** __restrict, size_t,
+	    mbstate_t * __restrict));
+size_t	wcrtomb __P((char * __restrict, wchar_t, mbstate_t * __restrict));
+wchar_t	*wcscat __P((wchar_t * __restrict, const wchar_t * __restrict));
 wchar_t	*wcschr __P((const wchar_t *, wchar_t));
 int	wcscmp __P((const wchar_t *, const wchar_t *));
-wchar_t	*wcscpy __P((wchar_t *, const wchar_t *));
+int	wcscoll __P((const wchar_t *, const wchar_t *));
+wchar_t	*wcscpy __P((wchar_t * __restrict, const wchar_t * __restrict));
 size_t	wcscspn __P((const wchar_t *, const wchar_t *));
 size_t	wcslen __P((const wchar_t *));
-wchar_t	*wcsncat __P((wchar_t *, const wchar_t *, size_t));
+wchar_t	*wcsncat __P((wchar_t * __restrict, const wchar_t * __restrict,
+	    size_t));
 int	wcsncmp __P((const wchar_t *, const wchar_t *, size_t));
-wchar_t	*wcsncpy __P((wchar_t *, const wchar_t *, size_t));
+wchar_t	*wcsncpy __P((wchar_t * __restrict , const wchar_t * __restrict,
+	    size_t));
 wchar_t	*wcspbrk __P((const wchar_t *, const wchar_t *));
 wchar_t	*wcsrchr __P((const wchar_t *, wchar_t));
+size_t	wcsrtombs __P((char * __restrict, const wchar_t ** __restrict, size_t,
+	    mbstate_t * __restrict));
 size_t	wcsspn __P((const wchar_t *, const wchar_t *));
 wchar_t	*wcsstr __P((const wchar_t *, const wchar_t *));
-int	wcswidth __P((const wchar_t *, size_t));
-int	wcwidth __P((wchar_t));
+wchar_t *wcstok __P((wchar_t * __restrict, const wchar_t * __restrict,
+		     wchar_t ** __restrict));
+size_t	wcsxfrm __P((wchar_t *, const wchar_t *, size_t));
+wchar_t	*wcswcs __P((const wchar_t *, const wchar_t *));
 wchar_t	*wmemchr __P((const wchar_t *, wchar_t, size_t));
 int	wmemcmp __P((const wchar_t *, const wchar_t *, size_t));
-wchar_t	*wmemcpy __P((wchar_t *, const wchar_t *, size_t));
+wchar_t	*wmemcpy __P((wchar_t * __restrict, const wchar_t * __restrict,
+	    size_t));
 wchar_t	*wmemmove __P((wchar_t *, const wchar_t *, size_t));
 wchar_t	*wmemset __P((wchar_t *, wchar_t, size_t));
+
+size_t	wcslcat __P((wchar_t *, const wchar_t *, size_t));
+size_t	wcslcpy __P((wchar_t *, const wchar_t *, size_t));
+int	wcswidth __P((const wchar_t *, size_t));
+int	wctob __P((wint_t));
+int	wcwidth __P((wchar_t));
+
+unsigned long int wcstoul __P((const wchar_t * __restrict,
+	wchar_t ** __restrict, int base));
+long int wcstol __P((const wchar_t * __restrict,
+	wchar_t ** __restrict, int base));
+double wcstod __P((const wchar_t * __restrict, wchar_t ** __restrict));
+
+#if defined(_ISOC99_SOURCE) || (__STDC_VERSION__ - 0) > 199901L || \
+    defined(_NETBSD_SOURCE)
+/* LONGLONG */
+long long int wcstoll __P((const wchar_t * __restrict,
+	wchar_t ** __restrict, int base));
+/* LONGLONG */
+unsigned long long int wcstoull __P((const wchar_t * __restrict,
+	wchar_t ** __restrict, int base));
+#endif
+
+wint_t ungetwc __P((wint_t, FILE *));
+wint_t fgetwc __P((FILE *));
+wchar_t *fgetws __P((wchar_t * __restrict, int, FILE * __restrict));
+wint_t getwc __P((FILE *));
+wint_t getwchar __P((void));
+wint_t fputwc __P((wchar_t, FILE *));
+int fputws __P((const wchar_t * __restrict, FILE * __restrict));
+wint_t putwc __P((wchar_t, FILE *));
+wint_t putwchar __P((wchar_t));
+
+int fwide __P((FILE *, int));
 __END_DECLS
 
 #endif /* !_WCHAR_H_ */