2005-10-13 Wu Yongwei <adah@users.sourceforge.net>

* include/tchar.h: Include <wchar.h> when _UNICODE is defined.
	(_TEOF): New macro definition for _UNICODE and non_UNICODE cases.
This commit is contained in:
Danny Smith 2005-10-13 20:31:50 +00:00
parent 0e7712aeeb
commit 5d023ae8d5
2 changed files with 20 additions and 0 deletions

View File

@ -1,3 +1,8 @@
2005-10-13 Wu Yongwei <adah@users.sourceforge.net>
* include/tchar.h: Include <wchar.h> when _UNICODE is defined.
(_TEOF): New macro definition for _UNICODE and non_UNICODE cases.
2005-10-12 Danny Smith <dannysmith@users.sourceforge.net>
* include/stddef.h: Remove.

View File

@ -31,6 +31,10 @@
*/
#ifdef _UNICODE
/*
* Include <wchar.h> for wchar_t and WEOF if _UNICODE.
*/
#include <wchar.h>
/*
* Use TCHAR instead of char or wchar_t. It will be appropriately translated
@ -44,6 +48,11 @@ typedef wchar_t _TCHAR;
#define _TCHAR_DEFINED
#endif
/*
* Use _TEOF instead of EOF or WEOF. It will be appropriately translated if
* _UNICODE is correctly defined (or not).
*/
#define _TEOF WEOF
/*
* __TEXT is a private macro whose specific use is to force the expansion of a
@ -212,6 +221,7 @@ typedef wchar_t _TCHAR;
#define _trewinddir _wrewinddir
#define _ttelldir _wtelldir
#define _tseekdir _wseekdir
#else /* Not _UNICODE */
/*
@ -225,6 +235,11 @@ typedef char _TCHAR;
#define _TCHAR_DEFINED
#endif
/*
* _TEOF, the constant you should use instead of EOF.
*/
#define _TEOF EOF
/*
* __TEXT is a private macro whose specific use is to force the expansion of a
* macro passed as an argument to the macros _T or _TEXT. DO NOT use this