X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=include%2Fwimlib_tchar.h;h=4c7ce9c5114ecec10ba8df6c25e9e89417f5f4bf;hb=c5e4bd4c75bf1f1e8c75c460853340a15917d55c;hp=8acaee1e5b6109fc19000a640979ec93a4e10560;hpb=edf0f7f5331e626b55819dcafa88e202cdb82a32;p=wimlib

diff --git a/include/wimlib_tchar.h b/include/wimlib_tchar.h
index 8acaee1e..4c7ce9c5 100644
--- a/include/wimlib_tchar.h
+++ b/include/wimlib_tchar.h
@@ -22,13 +22,15 @@ 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 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 +50,13 @@ 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 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. */
@@ -62,7 +64,6 @@ typedef wchar_t tchar;
 #  define tmkdir(path, mode) _wmkdir(path)
 #  define tstrerror_r   win32_strerror_r_replacement
 #  define trename	win32_rename_replacement
-#  define ttruncate	win32_truncate_replacement
 #  define tglob		win32_wglob
 #else /* __WIN32__ */
 /* For non-Windows builds, the "tchar" type will be one byte and will specify a
@@ -81,13 +82,15 @@ 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 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
@@ -109,15 +112,14 @@ 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 ttempnam	tempnam
 #  define tgetenv	getenv
-#  define totlower(c)	tolower((unsigned char)(c))
 #  define TSTRDUP	STRDUP
 #  define tstrerror_r	strerror_r
 #  define trename	rename
-#  define ttruncate	truncate
 #  define taccess	access
 #  define tglob		glob
 #endif /* !__WIN32__ */