From 37fb7a2ccbc0aa401402124b1586f2421ab46317 Mon Sep 17 00:00:00 2001 From: Earnie Boyd Date: Mon, 11 Jun 2001 18:13:15 +0000 Subject: [PATCH] * include/stdio.h (swscanf): Make first arugument const. * include/wchar.h (swscanf): Ditto. * include/tchar.h (_tfopen): New _UNICODE define. (_tgetenv): Ditto. (_tsetlocale): Ditto. --- winsup/mingw/ChangeLog | 8 ++++++++ winsup/mingw/include/stdio.h | 2 +- winsup/mingw/include/tchar.h | 6 ++++++ winsup/mingw/include/wchar.h | 2 +- 4 files changed, 16 insertions(+), 2 deletions(-) diff --git a/winsup/mingw/ChangeLog b/winsup/mingw/ChangeLog index 670096ac5..bd136f2c3 100644 --- a/winsup/mingw/ChangeLog +++ b/winsup/mingw/ChangeLog @@ -1,4 +1,12 @@ +2001-06-11 Mattia Barbon + + * include/stdio.h (swscanf): Make first arugument const. + * include/wchar.h (swscanf): Ditto. + * include/tchar.h (_tfopen): New _UNICODE define. + (_tgetenv): Ditto. + (_tsetlocale): Ditto. + 2001-06-04 Earnie Boyd * include/_mingw.h: Change version to 1.0. diff --git a/winsup/mingw/include/stdio.h b/winsup/mingw/include/stdio.h index c2b1cd496..c4c088500 100644 --- a/winsup/mingw/include/stdio.h +++ b/winsup/mingw/include/stdio.h @@ -311,7 +311,7 @@ int vwprintf (const wchar_t*, va_list); int vswprintf (wchar_t*, const wchar_t*, va_list); int fwscanf (FILE*, const wchar_t*, ...); int wscanf (const wchar_t*, ...); -int swscanf (wchar_t*, const wchar_t*, ...); +int swscanf (const wchar_t*, const wchar_t*, ...); wint_t fgetwc (FILE*); wint_t fputwc (wchar_t, FILE*); wint_t ungetwc (wchar_t, FILE*); diff --git a/winsup/mingw/include/tchar.h b/winsup/mingw/include/tchar.h index 2c0d03777..de17a61b8 100644 --- a/winsup/mingw/include/tchar.h +++ b/winsup/mingw/include/tchar.h @@ -186,11 +186,14 @@ typedef wchar_t TCHAR; #define _tcreat _wcreat #define _tfindfirst _wfindfirst #define _tfindnext _wfindnext +#define _tfopen _wfopen +#define _tgetenv _wgetenv #define _tmktemp _wmktemp #define _topen _wopen #define _tremove _wremove #define _trename _wrename #define _tsopen _wsopen +#define _tsetlocale _wsetlocale #define _tunlink _wunlink #define _tfinddata_t _wfinddata_t #define _tfindfirsti64 _wfindfirsti64 @@ -245,6 +248,8 @@ typedef char TCHAR; #define _fputtc fputc #define _fputtchar _fputchar #define _fputts fputs +#define _tfopen fopen +#define _tgetenv getenv #define _gettc getc #define _getts gets #define _puttc putc @@ -328,6 +333,7 @@ typedef char TCHAR; #define _tremove remove #define _trename rename #define _tsopen _sopen +#define _tsetlocale setlocale #define _tunlink _unlink #define _tfinddata_t _finddata_t diff --git a/winsup/mingw/include/wchar.h b/winsup/mingw/include/wchar.h index db60f7311..008d5f077 100644 --- a/winsup/mingw/include/wchar.h +++ b/winsup/mingw/include/wchar.h @@ -110,7 +110,7 @@ int vwprintf (const wchar_t*, va_list); int vswprintf (wchar_t*, const wchar_t*, va_list); int fwscanf (FILE*, const wchar_t*, ...); int wscanf (const wchar_t*, ...); -int swscanf (wchar_t*, const wchar_t*, ...); +int swscanf (const wchar_t*, const wchar_t*, ...); wint_t fgetwc (FILE*); wint_t fputwc (wchar_t, FILE*); wint_t ungetwc (wchar_t, FILE*);