X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=include%2Fwimlib_tchar.h;h=4d33efef554fa2c804a5b79bbc59dd10b81b03c0;hb=82bfc7bdc6a85406dff3fa4f9fcc7b9fc0ae5de5;hp=f0b17f01e51d06feda1f35b270994e1226a168c7;hpb=14cf34971b351167d88adb009051a3513e627f32;p=wimlib diff --git a/include/wimlib_tchar.h b/include/wimlib_tchar.h index f0b17f01..4d33efef 100644 --- a/include/wimlib_tchar.h +++ b/include/wimlib_tchar.h @@ -24,12 +24,13 @@ typedef wchar_t tchar; # define tmempcpy wmempcpy # define tstrcpy wcscpy # define tprintf wprintf -# define tsprintf swprintf +# define tsprintf _swprintf # define tfprintf fwprintf # define tvfprintf vfwprintf # define istalpha iswalpha # define istspace iswspace # define tstrcmp wcscmp +# define tstrncmp wcsncmp # define tstrchr wcschr # define tstrpbrk wcspbrk # define tstrrchr wcsrchr @@ -51,6 +52,7 @@ typedef wchar_t tchar; # define tstrerror _wcserror # define taccess _waccess # define tstrdup wcsdup +# define ttempnam _wtempnam /* 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. */ @@ -59,6 +61,7 @@ typedef wchar_t tchar; # 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 @@ -88,6 +91,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 @@ -109,11 +113,13 @@ typedef char tchar; # define tstrtoul strtoul # define tmkdir mkdir # define tstrdup strdup +# define ttempnam tempnam # 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 */