* include/stdio.h (swscanf): Make first arugument const.

	* include/wchar.h (swscanf): Ditto.
	* include/tchar.h (_tfopen): New _UNICODE define.
	(_tgetenv): Ditto.
	(_tsetlocale): Ditto.

diff --git a/winsup/mingw/ChangeLog b/winsup/mingw/ChangeLog
index 670096ac5159535dfd9a093822f58558211f000e..bd136f2c365a441608f01360c0d812c498a4ee3f 100644 (file)
--- a/winsup/mingw/ChangeLog
+++ b/winsup/mingw/ChangeLog
@@ -1,4 +1,12 @@
 
+2001-06-11  Mattia Barbon  <mbarbon@dsi.unive.it>
+
+       * 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  <earnie@users.sourceforge.net>
 
        * include/_mingw.h: Change version to 1.0.

diff --git a/winsup/mingw/include/stdio.h b/winsup/mingw/include/stdio.h
index c2b1cd49699a12fc2dc241e5a68094cb3bed436d..c4c0885007f3b2abc019c054b669ac5e62d789f5 100644 (file)
--- 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 2c0d03777a5d465c828c816fb3b3119938c09964..de17a61b8e700b4bfc182c375c554f938a81b950 100644 (file)
--- 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 db60f73119119a06412f808354e4aefd5b446eef..008d5f077f8c6e35e16033f62699381c60779e7f 100644 (file)
--- 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*);