From bb28f3c29b4c91af1b0e79e456294bb08735648a Mon Sep 17 00:00:00 2001 From: Warner Losh Date: Sat, 23 Mar 2002 17:24:55 +0000 Subject: Breath deep and take __P out of the system include files. # This appears to not break X11, but I'm having problems compiling the # glide part of the server with or without this patch, so I can't tell # for sure. --- include/wchar.h | 66 ++++++++++++++++++++++++++++----------------------------- 1 file changed, 32 insertions(+), 34 deletions(-) (limited to 'include/wchar.h') diff --git a/include/wchar.h b/include/wchar.h index c14c1b785c2b..a27fc54484b5 100644 --- a/include/wchar.h +++ b/include/wchar.h @@ -100,47 +100,45 @@ typedef _BSD_SIZE_T_ size_t; __BEGIN_DECLS #if 0 /* XXX: not implemented */ -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)); +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); #endif -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 * __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)); +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 *); +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); #if 0 /* XXX: not implemented */ -size_t wcsrtombs __P((char * __restrict, const wchar_t ** __restrict, size_t, - mbstate_t * __restrict)); +size_t wcsrtombs(char * __restrict, const wchar_t ** __restrict, size_t, + mbstate_t * __restrict); #endif -size_t wcsspn __P((const wchar_t *, const wchar_t *)); -wchar_t *wcsstr __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 wcsspn(const wchar_t *, const wchar_t *); +wchar_t *wcsstr(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 __P((wchar_t *, const wchar_t *, size_t)); -size_t wcslcpy __P((wchar_t *, const wchar_t *, size_t)); +size_t wcslcat(wchar_t *, const wchar_t *, size_t); +size_t wcslcpy(wchar_t *, const wchar_t *, size_t); #if 0 /* XXX: not implemented */ -int wcswidth __P((const wchar_t *, size_t)); -int wcwidth __P((wchar_t)); +int wcswidth(const wchar_t *, size_t); +int wcwidth(wchar_t); #endif __END_DECLS -- cgit v1.2.3