From 01111a94dc42d56da64c4af86c1c379afaabdea0 Mon Sep 17 00:00:00 2001 From: Eric Biggers Date: Mon, 8 Apr 2013 11:29:01 -0500 Subject: [PATCH] Fix compiling with --without-fuse --- src/lookup_table.c | 23 ++++++++++++++--------- src/wimlib_internal.h | 2 +- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/src/lookup_table.c b/src/lookup_table.c index 89b57b4e..432fca47 100644 --- a/src/lookup_table.c +++ b/src/lookup_table.c @@ -90,14 +90,14 @@ clone_lookup_table_entry(const struct wim_lookup_table_entry *old) case RESOURCE_WIN32: case RESOURCE_WIN32_ENCRYPTED: #endif + case RESOURCE_IN_FILE_ON_DISK: #ifdef WITH_FUSE case RESOURCE_IN_STAGING_FILE: -#endif - case RESOURCE_IN_FILE_ON_DISK: BUILD_BUG_ON((void*)&old->file_on_disk != (void*)&old->staging_file_name); - new->staging_file_name = TSTRDUP(old->staging_file_name); - if (!new->staging_file_name) +#endif + new->file_on_disk = TSTRDUP(old->file_on_disk); + if (!new->file_on_disk) goto out_free; break; case RESOURCE_IN_ATTACHED_BUFFER: @@ -144,14 +144,17 @@ free_lookup_table_entry(struct wim_lookup_table_entry *lte) { if (lte) { switch (lte->resource_location) { - case RESOURCE_IN_STAGING_FILE: - case RESOURCE_IN_ATTACHED_BUFFER: - case RESOURCE_IN_FILE_ON_DISK: -#ifdef __WIN32__ + #ifdef __WIN32__ case RESOURCE_WIN32: -#endif + case RESOURCE_WIN32_ENCRYPTED: + #endif + #ifdef WITH_FUSE + case RESOURCE_IN_STAGING_FILE: BUILD_BUG_ON((void*)<e->file_on_disk != (void*)<e->staging_file_name); + #endif + case RESOURCE_IN_FILE_ON_DISK: + case RESOURCE_IN_ATTACHED_BUFFER: BUILD_BUG_ON((void*)<e->file_on_disk != (void*)<e->attached_buffer); FREE(lte->file_on_disk); @@ -673,10 +676,12 @@ print_lookup_table_entry(const struct wim_lookup_table_entry *lte, FILE *out) tfprintf(out, T("File on Disk = `%"TS"'\n"), lte->file_on_disk); break; +#ifdef WITH_FUSE case RESOURCE_IN_STAGING_FILE: tfprintf(out, T("Staging File = `%"TS"'\n"), lte->staging_file_name); break; +#endif default: break; } diff --git a/src/wimlib_internal.h b/src/wimlib_internal.h index 6528b77f..6396c00a 100644 --- a/src/wimlib_internal.h +++ b/src/wimlib_internal.h @@ -31,7 +31,7 @@ #include "list.h" #include "wimlib.h" -#ifdef WITH_FUSE +#if defined(WITH_FUSE) || defined(ENABLE_MULTITHREADED_COMPRESSION) #include #endif -- 2.43.0