From 4263fdbc0599a27356b6afb9e6bf6daf786c1363 Mon Sep 17 00:00:00 2001 From: Eric Biggers Date: Wed, 25 Dec 2013 01:12:14 -0600 Subject: [PATCH] Make --disable-multithreaded-compression work again --- include/wimlib/chunk_compressor.h | 2 ++ src/compress_parallel.c | 4 ++++ src/write.c | 2 ++ 3 files changed, 8 insertions(+) diff --git a/include/wimlib/chunk_compressor.h b/include/wimlib/chunk_compressor.h index 176dc531..4684a61c 100644 --- a/include/wimlib/chunk_compressor.h +++ b/include/wimlib/chunk_compressor.h @@ -59,10 +59,12 @@ struct chunk_compressor { /* Functions that return implementations of the chunk_compressor interface. */ +#ifdef ENABLE_MULTITHREADED_COMPRESSION int new_parallel_chunk_compressor(int out_ctype, u32 out_chunk_size, unsigned num_threads, u64 max_memory, struct chunk_compressor **compressor_ret); +#endif int new_serial_chunk_compressor(int out_ctype, u32 out_chunk_size, diff --git a/src/compress_parallel.c b/src/compress_parallel.c index d0ce5266..fa7f5dde 100644 --- a/src/compress_parallel.c +++ b/src/compress_parallel.c @@ -26,6 +26,8 @@ # include "config.h" #endif +#ifdef ENABLE_MULTITHREADED_COMPRESSION + #include "wimlib/assert.h" #include "wimlib/chunk_compressor.h" #include "wimlib/error.h" @@ -534,3 +536,5 @@ err: parallel_chunk_compressor_destroy(&ctx->base); return ret; } + +#endif /* ENABLE_MULTITHREADED_COMPRESSION */ diff --git a/src/write.c b/src/write.c index e495cb5b..4af3a7a3 100644 --- a/src/write.c +++ b/src/write.c @@ -1349,6 +1349,7 @@ write_stream_list(struct list_head *stream_list, "actually be written uncompressed."); } + #ifdef ENABLE_MULTITHREADED_COMPRESSION if (ctx.num_bytes_to_compress >= 2000000) { ret = new_parallel_chunk_compressor(out_ctype, out_chunk_size, @@ -1359,6 +1360,7 @@ write_stream_list(struct list_head *stream_list, "(status %d)", ret); } } + #endif if (ctx.compressor == NULL) { ret = new_serial_chunk_compressor(out_ctype, out_chunk_size, -- 2.43.0