X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;ds=sidebyside;f=include%2Fwimlib_tchar.h;h=d5a5c66e74012010bbc6d7101e3f63e5cf52faa2;hb=19ce03addb8071555d951a965fa0bd7e3ae7224b;hp=519c425d675b102d995b248388b9f5206dc7b641;hpb=864db0e0929d60b33b8b0df35ccb68d43e7f8684;p=wimlib diff --git a/include/wimlib_tchar.h b/include/wimlib_tchar.h index 519c425d..d5a5c66e 100644 --- a/include/wimlib_tchar.h +++ b/include/wimlib_tchar.h @@ -15,7 +15,6 @@ typedef wchar_t tchar; # define T(text) _T(text) /* Make a string literal into a wide string */ # define TS "ls" /* Format a string of "tchar" */ # define TC "lc" /* Format a "tchar" */ -# define WS "ls" /* Format a UTF-16LE string (same as above) */ /* For Windows builds, the following definitions replace the "tchar" functions * with the "wide-character" functions. */ @@ -53,7 +52,6 @@ typedef wchar_t tchar; # 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 @@ -63,7 +61,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 @@ -76,11 +73,6 @@ typedef char tchar; # define TS "s" /* Similarly, a string of "tchar" is printed just as a normal string. */ # define TC "c" /* Print a single character */ -# define WS "W" /* UTF-16LE strings must be printed using a special - extension implemented by wimlib itself. Note that - "ls" will not work here because a string of wide - characters on non-Windows systems is typically not - UTF-16LE. */ /* For non-Windows builds, replace the "tchar" functions with the regular old * string functions. */ # define tmemchr memchr @@ -117,13 +109,11 @@ typedef char tchar; # 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__ */