diff options
author | tjr <tjr@FreeBSD.org> | 2002-09-10 09:43:28 +0000 |
---|---|---|
committer | tjr <tjr@FreeBSD.org> | 2002-09-10 09:43:28 +0000 |
commit | 80df78435a9e03bd1df460f4e1ac4a6afbddd219 (patch) | |
tree | 8f94b8a1b0526b328c757aa4eb54c73e4e4be548 | |
parent | 924bf5d265f1ad8699a453996a00316eb4d9f5b9 (diff) | |
download | FreeBSD-src-80df78435a9e03bd1df460f4e1ac4a6afbddd219.zip FreeBSD-src-80df78435a9e03bd1df460f4e1ac4a6afbddd219.tar.gz |
Replace FILE with struct __sFILE in the prototypes for the wide character
I/O functions to avoid having to bring in pollution from <stdio.h>.
Suggested by: bde
-rw-r--r-- | include/wchar.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/include/wchar.h b/include/wchar.h index 1871222..c206ab0 100644 --- a/include/wchar.h +++ b/include/wchar.h @@ -70,8 +70,6 @@ #include <sys/cdefs.h> #include <sys/_types.h> -#include <stdio.h> - #ifndef NULL #define NULL 0 #endif @@ -102,15 +100,17 @@ typedef __wint_t wint_t; #define WEOF ((wint_t)-1) #endif +struct __sFILE; + __BEGIN_DECLS wint_t btowc(int); -wint_t fgetwc(FILE *); +wint_t fgetwc(struct __sFILE *); wchar_t * - fgetws(wchar_t * __restrict, int, FILE * __restrict); -wint_t fputwc(wchar_t, FILE *); -int fputws(const wchar_t * __restrict, FILE * __restrict); -int fwide(FILE *, int); -wint_t getwc(FILE *); + fgetws(wchar_t * __restrict, int, struct __sFILE * __restrict); +wint_t fputwc(wchar_t, struct __sFILE *); +int fputws(const wchar_t * __restrict, struct __sFILE * __restrict); +int fwide(struct __sFILE *, int); +wint_t getwc(struct __sFILE *); wint_t getwchar(void); size_t mbrlen(const char * __restrict, size_t, mbstate_t * __restrict); size_t mbrtowc(wchar_t * __restrict, const char * __restrict, size_t, @@ -118,9 +118,9 @@ size_t mbrtowc(wchar_t * __restrict, const char * __restrict, size_t, int mbsinit(const mbstate_t *); size_t mbsrtowcs(wchar_t * __restrict, const char ** __restrict, size_t, mbstate_t * __restrict); -wint_t putwc(wchar_t, FILE *); +wint_t putwc(wchar_t, struct __sFILE *); wint_t putwchar(wchar_t); -wint_t ungetwc(wint_t, FILE *); +wint_t ungetwc(wint_t, struct __sFILE *); 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); |