extract.c: don't use ifdef within macro argument

[wimlib] / src / extract.c

diff --git a/src/extract.c b/src/extract.c
index 65f93338841563593a30b148a747118c11967377..01bc1a5bebca03ff52769104f8f0bd76c193372d 100644 (file)
--- a/src/extract.c
+++ b/src/extract.c
@@ -28,7 +28,7 @@
  * wimlib_extract_pathlist().  Internally, all end up calling
  * do_wimlib_extract_paths() and extract_trees().
  *
- * Although wimlib supports multiple extraction modes/backends (NTFS-3g, UNIX,
+ * Although wimlib supports multiple extraction modes/backends (NTFS-3G, UNIX,
  * Win32), this file does not itself have code to extract files or directories
  * to any specific target; instead, it handles generic functionality and relies
  * on lower-level callback functions declared in `struct apply_operations' to do
@@ -761,9 +761,7 @@ dentry_calculate_extraction_name(struct wim_dentry *dentry,
 
        if (!ctx->supported_features.case_sensitive_filenames) {
                struct wim_dentry *other;
-               list_for_each_entry(other, &dentry->d_ci_conflict_list,
-                                   d_ci_conflict_list)
-               {
+               dentry_for_each_ci_match(other, dentry) {
                        if (will_extract_dentry(other)) {
                                if (ctx->extract_flags &
                                    WIMLIB_EXTRACT_FLAG_ALL_CASE_CONFLICTS) {
@@ -1542,7 +1540,7 @@ check_extract_flags(const WIMStruct *wim, int *extract_flags_p)
 
 #ifndef WITH_NTFS_3G
        if (extract_flags & WIMLIB_EXTRACT_FLAG_NTFS) {
-               ERROR("wimlib was compiled without support for NTFS-3g, so\n"
+               ERROR("wimlib was compiled without support for NTFS-3G, so\n"
                      "        it cannot apply a WIM image directly to an NTFS volume.");
                return WIMLIB_ERR_UNSUPPORTED;
        }
@@ -1756,13 +1754,11 @@ extract_single_image(WIMStruct *wim, int image,
 }
 
 static const tchar * const filename_forbidden_chars =
-T(
 #ifdef __WIN32__
-"<>:\"/\\|?*"
+T("<>:\"/\\|?*");
 #else
-"/"
+T("/");
 #endif
-);
 
 /* This function checks if it is okay to use a WIM image's name as a directory
  * name.  */