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
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- src/include/wchar.h	2004/05/08 21:57:05	1.20
+++ src/include/wchar.h	2005/02/03 04:39:32	1.21
@@ -1,4 +1,4 @@
-/*	$NetBSD: wchar.h,v 1.20 2004/05/08 21:57:05 kleink Exp $	*/
+/*	$NetBSD: wchar.h,v 1.21 2005/02/03 04:39:32 perry Exp $	*/
 
 /*-
  * Copyright (c)1999 Citrus Project,
@@ -93,86 +93,83 @@ typedef	_BSD_SIZE_T_	size_t;
 #undef	_BSD_SIZE_T_
 #endif
 
-#ifndef WEOF
-#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
-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 *));
-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 * __restrict, const wchar_t * __restrict,
-	    size_t));
-int	wcsncmp __P((const 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 *));
-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 * __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));
-long int wcstol __P((const wchar_t * __restrict,
-	wchar_t ** __restrict, int));
-double wcstod __P((const wchar_t * __restrict, wchar_t ** __restrict));
+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	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 __P((const wchar_t * __restrict,
-	wchar_t ** __restrict, int));
+long long int wcstoll(const wchar_t * __restrict,
+	wchar_t ** __restrict, int);
 /* LONGLONG */
-unsigned long long int wcstoull __P((const wchar_t * __restrict,
-	wchar_t ** __restrict, int));
+unsigned long long int wcstoull(const wchar_t * __restrict,
+	wchar_t ** __restrict, int);
 #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));
+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 __P((FILE *, int));
+int fwide(FILE *, int);
 __END_DECLS
 
+#ifndef WEOF
+#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)
+
 #endif /* !_WCHAR_H_ */