resource.c: Cleanup and refactor

[wimlib] / include / wimlib_tchar.h

diff --git a/include/wimlib_tchar.h b/include/wimlib_tchar.h
index f0b17f01e51d06feda1f35b270994e1226a168c7..5b92310066b5781291430e25f716b16353349d33 100644 (file)
--- a/include/wimlib_tchar.h
+++ b/include/wimlib_tchar.h
@@ -30,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
@@ -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 */