Use little endian types for 'struct wim_header_disk'

[wimlib] / include / wimlib_tchar.h

diff --git a/include/wimlib_tchar.h b/include/wimlib_tchar.h
index fefaabc491158d345191aba11bfc68905c8b8fe2..c372b820e1cccd2b801915c5bc854b4abaab6654 100644 (file)
--- a/include/wimlib_tchar.h
+++ b/include/wimlib_tchar.h
@@ -15,13 +15,14 @@ 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. */
 #  define tmemchr      wmemchr
 #  define tmemcpy      wmemcpy
+#  define tmemmove     wmemmove
 #  define tmempcpy     wmempcpy
+#  define tstrcat      wcscat
 #  define tstrcpy      wcscpy
 #  define tprintf      wprintf
 #  define tsprintf     swprintf
@@ -52,7 +53,9 @@ 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. */
@@ -60,7 +63,7 @@ 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
  * string in the locale-dependent multibyte encoding.  However, only UTF-8 is
@@ -72,16 +75,13 @@ 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
 #  define tmemcpy      memcpy
+#  define tmemmove     memmove
 #  define tmempcpy     mempcpy
+#  define tstrcat      strcat
 #  define tstrcpy      strcpy
 #  define tprintf      printf
 #  define tsprintf     sprintf
@@ -112,12 +112,14 @@ 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
-#  define ttruncate    truncate
 #  define taccess      access
+#  define tglob                glob
 #endif /* !__WIN32__ */
 
 #endif /* _WIMLIB_TCHAR_H */