X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=include%2Fwimlib_tchar.h;h=d8c6915c7024104475760213fd50f7f9148c698b;hp=b468ef366277151637795d4499be4b55188c092d;hb=719a063c87e3abab99b0fb53ebc80223fbf33123;hpb=0f54c853de1450b7487077264f4031c061f3795b

diff --git a/include/wimlib_tchar.h b/include/wimlib_tchar.h
index b468ef36..d8c6915c 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
@@ -52,9 +54,8 @@ typedef wchar_t tchar;
 #  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. */
@@ -80,13 +81,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
@@ -110,9 +113,8 @@ typedef char tchar;
 #  define tstrtoul	strtoul
 #  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