From 97b6ae270d84b06016651819158a03237602b07b Mon Sep 17 00:00:00 2001 From: Danny Smith Date: Sat, 20 Apr 2002 05:13:20 +0000 Subject: [PATCH] * include/tchar.h (_tputenv): Add UNICODE mappings. (_tsearchenv): Likewise. (_tmakepath): Likewise. (_tsplitpath): Likewise. (_tfullpath): Likewise. (__TEXT): Make same as define in w32api/include/winnt.h. --- winsup/mingw/ChangeLog | 5 +++++ winsup/mingw/include/tchar.h | 14 ++++++++++++-- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/winsup/mingw/ChangeLog b/winsup/mingw/ChangeLog index 393c8f844..1d0a84169 100644 --- a/winsup/mingw/ChangeLog +++ b/winsup/mingw/ChangeLog @@ -1,3 +1,8 @@ +2002-04-20 Danny Smith + + * include/tchar.h (__TEXT): Make same as define in + w32api/include/winnt.h. + 2002-04-20 Danny Smith * include/tchar.h (_tputenv): Add UNICODE mappings. diff --git a/winsup/mingw/include/tchar.h b/winsup/mingw/include/tchar.h index 0e4676675..2b19c16a7 100644 --- a/winsup/mingw/include/tchar.h +++ b/winsup/mingw/include/tchar.h @@ -67,7 +67,7 @@ typedef wchar_t _TCHAR; * macro within your programs. It's name and function could change without * notice. */ -#define __TEXT(x) L##x +#define __TEXT(q) L##q /* for porting from other Windows compilers */ #if 0 // no wide startup module @@ -189,6 +189,11 @@ typedef wchar_t _TCHAR; #define _tfindnext _wfindnext #define _tfopen _wfopen #define _tgetenv _wgetenv +#define _tputenv _wputenv +#define _tsearchenv _wsearchenv +#define _tmakepath _wmakepath +#define _tsplitpath _wsplitpath +#define _tfullpath _wfullpath #define _tmktemp _wmktemp #define _topen _wopen #define _tremove _wremove @@ -221,7 +226,7 @@ typedef char _TCHAR; * macro within your programs. It's name and function could change without * notice. */ -#define __TEXT(x) x +#define __TEXT(q) q /* for porting from other Windows compilers */ #define _tmain main @@ -252,6 +257,11 @@ typedef char _TCHAR; #define _fputts fputs #define _tfopen fopen #define _tgetenv getenv +#define _tputenv _putenv +#define _tsearchenv _searchenv +#define _tmakepath _makepath +#define _tsplitpath _splitpath +#define _tfullpath _fullpath #define _gettc getc #define _getts gets #define _puttc putc