From 5207d0c8bcfe95f2400dafbcc2b8f3eef59d190e Mon Sep 17 00:00:00 2001 From: "Tim J. Robbins" Date: Tue, 10 Sep 2002 09:43:28 +0000 Subject: [PATCH] Replace FILE with struct __sFILE in the prototypes for the wide character I/O functions to avoid having to bring in pollution from . Suggested by: bde --- include/wchar.h | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/include/wchar.h b/include/wchar.h index 18712220c20..c206ab0500f 100644 --- a/include/wchar.h +++ b/include/wchar.h @@ -70,8 +70,6 @@ #include #include -#include - #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);