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