X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=include%2Fwimlib_tchar.h;h=ecaae5d5fb17f1eafb242015fe93cc15f9b3622a;hp=e902fab39a4e2227cb92888a0e0f346f28c5d5c3;hb=7d3c6d1a380bbd9e9074dce19b65bb5ac0ae4675;hpb=e8c3ca2d1d0cac3d64985b45a9f654d2029a7518 diff --git a/include/wimlib_tchar.h b/include/wimlib_tchar.h index e902fab3..ecaae5d5 100644 --- a/include/wimlib_tchar.h +++ b/include/wimlib_tchar.h @@ -21,6 +21,7 @@ typedef wchar_t tchar; * with the "wide-character" functions. */ # define tmemchr wmemchr # define tmemcpy wmemcpy +# define tmempcpy wmempcpy # define tstrcpy wcscpy # define tprintf wprintf # define tsprintf swprintf @@ -29,6 +30,7 @@ typedef wchar_t tchar; # define istalpha iswalpha # define istspace iswspace # define tstrcmp wcscmp +# define tstrncmp wcsncmp # define tstrchr wcschr # define tstrpbrk wcspbrk # define tstrrchr wcsrchr @@ -49,14 +51,19 @@ typedef wchar_t tchar; # 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. */ -# define TSTRDUP WSTRDUP +# define TSTRDUP WCSDUP # 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 * string in the locale-dependent multibyte encoding. However, only UTF-8 is @@ -77,6 +84,7 @@ typedef char tchar; * string functions. */ # define tmemchr memchr # define tmemcpy memcpy +# define tmempcpy mempcpy # define tstrcpy strcpy # define tprintf printf # define tsprintf sprintf @@ -85,6 +93,7 @@ typedef char tchar; # define istalpha isalpha # define istspace isspace # define tstrcmp strcmp +# define tstrncmp strncmp # define tstrchr strchr # define tstrpbrk strpbrk # define tstrrchr strrchr @@ -105,11 +114,16 @@ typedef char tchar; # define tstrtod strtod # define tstrtoul strtoul # 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 # define ttruncate truncate # define taccess access +# define tglob glob #endif /* !__WIN32__ */ #endif /* _WIMLIB_TCHAR_H */