PDCLIB-2: <wchar.h>: don't expect or expose definition of FILE. Declare mbstate_t...

[pdclib] / includes / wchar.h

diff --git a/includes/wchar.h b/includes/wchar.h
index a98abdbdea20ba7aa1f2d5397c304c44ca68516b..bac7f40e40524f8cf0f1c65229c651897c9d22c2 100644 (file)
--- a/includes/wchar.h
+++ b/includes/wchar.h
@@ -32,7 +32,7 @@ typedef _PDCLIB_wint_t wint_t;
 \r
 #ifndef _PDCLIB_MBSTATE_T_DEFINED\r
 #define _PDCLIB_MBSTATE_T_DEFINED _PDCLIB_MBSTATE_T_DEFINED\r
-typedef _PDCLIB_mbstate_t mbstate_t;\r
+typedef struct _PDCLIB_mbstate_t mbstate_t;\r
 #endif\r
 \r
 struct tm;\r
@@ -78,28 +78,28 @@ size_t wcsftime(wchar_t *_PDCLIB_restrict s, size_t maxsize, const wchar_t *_PDC
 #endif\r
 \r
 /* Wide character I/O */\r
-int fwprintf(FILE *_PDCLIB_restrict stream, const wchar_t *_PDCLIB_restrict format, ...);\r
-int fwscanf(FILE *_PDCLIB_restrict stream, const wchar_t *_PDCLIB_restrict format, ...);\r
+int fwprintf(struct _PDCLIB_file_t *_PDCLIB_restrict stream, const wchar_t *_PDCLIB_restrict format, ...);\r
+int fwscanf(struct _PDCLIB_file_t *_PDCLIB_restrict stream, const wchar_t *_PDCLIB_restrict format, ...);\r
 int swprintf(wchar_t *_PDCLIB_restrict s, size_t n, const wchar_t *_PDCLIB_restrict format, ...);\r
 int swscanf(const wchar_t *_PDCLIB_restrict s, const wchar_t *_PDCLIB_restrict format, ...);\r
-int vfwprintf(FILE *_PDCLIB_restrict stream, const wchar_t *_PDCLIB_restrict format, va_list arg);\r
-int vfwscanf(FILE *_PDCLIB_restrict stream, const wchar_t *_PDCLIB_restrict format, va_list arg);\r
-int vswprintf(wchar_t *_PDCLIB_restrict s, size_t n, const wchar_t *_PDCLIB_restrict format, va_list arg);\r
-int vswscanf(const wchar_t *_PDCLIB_restrict s, const wchar_t *_PDCLIB_restrict format, va_list arg);\r
-int vwprintf(const wchar_t *_PDCLIB_restrict format, va_list arg);\r
-int vwscanf(const wchar_t *_PDCLIB_restrict format, va_list arg);\r
+int vfwprintf(struct _PDCLIB_file_t *_PDCLIB_restrict stream, const wchar_t *_PDCLIB_restrict format, _PDCLIB_va_list arg);\r
+int vfwscanf(struct _PDCLIB_file_t *_PDCLIB_restrict stream, const wchar_t *_PDCLIB_restrict format, _PDCLIB_va_list arg);\r
+int vswprintf(wchar_t *_PDCLIB_restrict s, size_t n, const wchar_t *_PDCLIB_restrict format, _PDCLIB_va_list arg);\r
+int vswscanf(const wchar_t *_PDCLIB_restrict s, const wchar_t *_PDCLIB_restrict format, _PDCLIB_va_list arg);\r
+int vwprintf(const wchar_t *_PDCLIB_restrict format, _PDCLIB_va_list arg);\r
+int vwscanf(const wchar_t *_PDCLIB_restrict format, _PDCLIB_va_list arg);\r
 int wprintf(const wchar_t *_PDCLIB_restrict format, ...);\r
 int wscanf(const wchar_t *_PDCLIB_restrict format, ...);\r
-wint_t fgetwc(FILE *stream);\r
-wchar_t *fgetws(wchar_t *_PDCLIB_restrict s, int n, FILE *_PDCLIB_restrict stream);\r
-wint_t fputwc(wchar_t c, FILE *stream);\r
-int fputws(const wchar_t *_PDCLIB_restrict s, FILE *_PDCLIB_restrict stream);\r
-int fwide(FILE *stream, int mode);\r
-wint_t getwc(FILE *stream);\r
+wint_t fgetwc(struct _PDCLIB_file_t *stream);\r
+wchar_t *fgetws(wchar_t *_PDCLIB_restrict s, int n, struct _PDCLIB_file_t *_PDCLIB_restrict stream);\r
+wint_t fputwc(wchar_t c, struct _PDCLIB_file_t *stream);\r
+int fputws(const wchar_t *_PDCLIB_restrict s, struct _PDCLIB_file_t *_PDCLIB_restrict stream);\r
+int fwide(struct _PDCLIB_file_t *stream, int mode);\r
+wint_t getwc(struct _PDCLIB_file_t *stream);\r
 wint_t getwchar(void);\r
-wint_t putwc(wchar_t c, FILE *stream);\r
+wint_t putwc(wchar_t c, struct _PDCLIB_file_t *stream);\r
 wint_t putwchar(wchar_t c);\r
-wint_t ungetwc(wint_t c, FILE *stream);\r
+wint_t ungetwc(wint_t c, struct _PDCLIB_file_t *stream);\r
 \r
 /* Wide character <-> Numeric conversions */\r
 #if 0\r