Make --disable-multithreaded-compression work again

[wimlib] / include / wimlib / wim.h

diff --git a/include/wimlib/wim.h b/include/wimlib/wim.h
index 4afa60eb8594943ecc8ad06e4d8912384e51627b..99a37362eefd6420d0e7a0b15b2b0733edc7e750 100644 (file)
--- a/include/wimlib/wim.h
+++ b/include/wimlib/wim.h
@@ -42,8 +42,9 @@ struct WIMStruct {
        /* Temporary field */
        void *private;
 
-       /* LZX compression context for default thread  */
-       struct wimlib_lzx_context *lzx_context;
+       struct wimlib_decompressor *decompressor;
+       enum wimlib_compression_type decompressor_ctype;
+       u32 decompressor_max_block_size;
 
        struct list_head subwims;
 
@@ -94,7 +95,7 @@ static inline bool wim_is_pipable(const WIMStruct *wim)
 
 static inline bool wim_has_integrity_table(const WIMStruct *wim)
 {
-       return (wim->hdr.integrity.offset != 0);
+       return (wim->hdr.integrity_table_reshdr.offset_in_wim != 0);
 }
 
 static inline bool wim_has_metadata(const WIMStruct *wim)
@@ -112,8 +113,7 @@ extern int
 init_wim_header(struct wim_header *hdr, int ctype, u32 chunk_size);
 
 extern int
-read_wim_header(const tchar *filename, struct filedes *in_fd,
-               struct wim_header *hdr);
+read_wim_header(WIMStruct *wim, struct wim_header *hdr);
 
 extern int
 write_wim_header(const struct wim_header *hdr, struct filedes *out_fd);