X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=include%2Fwimlib_tchar.h;h=5a2038f07508de2904492d1a19f8efc3febf053b;hb=b27e5a1c6b1662eda54ce751b8586fd7d5fb5133;hp=8248d8d953b86c494999d66b7e21ad1f8abdde29;hpb=c1d980511c9b9e53dec66710904ad8f98bc22809;p=wimlib

diff --git a/include/wimlib_tchar.h b/include/wimlib_tchar.h
index 8248d8d9..5a2038f0 100644
--- a/include/wimlib_tchar.h
+++ b/include/wimlib_tchar.h
@@ -22,13 +22,16 @@ typedef wchar_t tchar;
 #  define tmemcpy	wmemcpy
 #  define tmemmove	wmemmove
 #  define tmempcpy	wmempcpy
+#  define tstrcat	wcscat
 #  define tstrcpy	wcscpy
 #  define tprintf	wprintf
 #  define tsprintf	swprintf
 #  define tfprintf	fwprintf
 #  define tvfprintf	vfwprintf
-#  define istalpha	iswalpha
-#  define istspace	iswspace
+#  define tscanf	swscanf
+#  define istalpha(c)	iswalpha((wchar_t)(c))
+#  define istspace(c)	iswspace((wchar_t)(c))
+#  define totlower(c)	towlower((wchar_t)(c))
 #  define tstrcmp	wcscmp
 #  define tstrncmp	wcsncmp
 #  define tstrchr	wcschr
@@ -48,13 +51,12 @@ typedef wchar_t tchar;
 #  define tstrtol	wcstol
 #  define tstrtod	wcstod
 #  define tstrtoul	wcstoul
+#  define tstrtoull	wcstoull
 #  define tunlink	_wunlink
 #  define tstrerror	_wcserror
 #  define taccess	_waccess
 #  define tstrdup	wcsdup
-#  define ttempnam	_wtempnam
 #  define tgetenv	_wgetenv
-#  define totlower(c)	towlower((wchar_t)(c))
 /* The following "tchar" functions do not have exact wide-character equivalents
  * on Windows so require parameter rearrangement or redirection to a replacement
  * function defined ourselves. */
@@ -80,13 +82,16 @@ typedef char tchar;
 #  define tmemcpy	memcpy
 #  define tmemmove	memmove
 #  define tmempcpy	mempcpy
+#  define tstrcat	strcat
 #  define tstrcpy	strcpy
 #  define tprintf	printf
 #  define tsprintf	sprintf
 #  define tfprintf	fprintf
 #  define tvfprintf	vfprintf
-#  define istalpha	isalpha
-#  define istspace	isspace
+#  define tscanf	sscanf
+#  define istalpha(c)	isalpha((unsigned char)(c))
+#  define istspace(c)	isspace((unsigned char)(c))
+#  define totlower(c)	tolower((unsigned char)(c))
 #  define tstrcmp	strcmp
 #  define tstrncmp	strncmp
 #  define tstrchr	strchr
@@ -108,11 +113,10 @@ typedef char tchar;
 #  define tstrtol	strtol
 #  define tstrtod	strtod
 #  define tstrtoul	strtoul
+#  define tstrtoull	strtoull
 #  define tmkdir	mkdir
 #  define tstrdup	strdup
-#  define ttempnam	tempnam
 #  define tgetenv	getenv
-#  define totlower(c)	tolower((unsigned char)(c))
 #  define TSTRDUP	STRDUP
 #  define tstrerror_r	strerror_r
 #  define trename	rename