--- mstools/h/tchar.h	2018/08/09 18:20:30	1.1
+++ mstools/h/tchar.h	2018/08/09 18:23:04	1.1.1.3
@@ -1,7 +1,7 @@
 /***
 *tchar.h - definitions for generic international functions
 *
-*	Copyright (c) 1991-1992, Microsoft Corporation. All rights reserved.
+*	Copyright (c) 1991-1993, Microsoft Corporation. All rights reserved.
 *
 *Purpose:
 *	Definitions for generic international functions, mostly defines
@@ -18,14 +18,16 @@
 extern "C" {
 #endif
 
-
-/* obsolete: remove any references */
-#define _TSTART
-
 #ifdef	_UNICODE
 
+#ifndef _TCHAR_DEFINED
 typedef wchar_t		TCHAR;
-#define _T(x)		L ## x
+#define _TCHAR_DEFINED
+#endif
+
+#define __T(x)		L ## x
+
+#define _TEOF		WEOF
 
 #define _tprintf	wprintf
 #define _ftprintf	fwprintf
@@ -35,6 +37,25 @@ typedef wchar_t		TCHAR;
 #define _vftprintf	vfwprintf
 #define _vstprintf	vswprintf
 #define _vsntprintf	_vsnwprintf
+#define _tscanf		wscanf
+#define _ftscanf	fwscanf
+#define _stscanf	swscanf
+
+#define _fgettc		fgetwc
+#define _fgettchar	fgetwchar
+#define _fgetts		fgetws
+#define _fputtc		fputwc
+#define _fputtchar	fputwchar
+#define _fputts		fputws
+#define _gettc		getwc
+#define _getts		getws
+#define _puttc		putwc
+#define _putts		putws
+#define _ungettc	ungetwc
+
+#define _tcstod		wcstod
+#define _tcstol		wcstol
+#define _tcstoul	wcstoul
 
 #define _tcscat		wcscat
 #define _tcschr		wcschr
@@ -49,6 +70,7 @@ typedef wchar_t		TCHAR;
 #define _tcsrchr	wcsrchr
 #define _tcsspn		wcsspn
 #define _tcsstr		wcsstr
+#define _tcstok		wcstok
 
 #define _tcsdup		_wcsdup
 #define _tcsicmp	_wcsicmp
@@ -79,10 +101,16 @@ typedef wchar_t		TCHAR;
 #define _totupper	towupper
 #define _totlower	towlower
 
-#else
+#else	/* _UNICODE */
 
+#ifndef _TCHAR_DEFINED
 typedef char		TCHAR;
-#define _T(x)		x
+#define _TCHAR_DEFINED
+#endif
+
+#define __T(x)		x
+
+#define _TEOF		EOF
 
 #define _tprintf	printf
 #define _ftprintf	fprintf
@@ -96,6 +124,22 @@ typedef char		TCHAR;
 #define _ftscanf	fscanf
 #define _stscanf	sscanf
 
+#define _fgettc		fgetc
+#define _fgettchar	fgetchar
+#define _fgetts		fgets
+#define _fputtc		fputc
+#define _fputtchar	fputchar
+#define _fputts		fputs
+#define _gettc		getc
+#define _getts		gets
+#define _puttc		putc
+#define _putts		puts
+#define _ungettc	ungetc
+
+#define _tcstod		strtod
+#define _tcstol		strtol
+#define _tcstoul	strtoul
+
 #define _tcscat		strcat
 #define _tcschr		strchr
 #define _tcscmp		strcmp
@@ -140,7 +184,10 @@ typedef char		TCHAR;
 #define _totupper	toupper
 #define _totlower	tolower
 
-#endif /* _UNICODE */
+#endif	/* _UNICODE */
+
+#define _T(x)		__T(x)
+#define _TEXT(x)	__T(x)
 
 #ifdef __cplusplus
 }