diff options
| author | Lasse Collin <lasse.collin@tukaani.org> | 2013-06-23 18:57:23 +0300 |
|---|---|---|
| committer | Lasse Collin <lasse.collin@tukaani.org> | 2013-06-23 18:57:23 +0300 |
| commit | 46540e4c10923e363741ff5aab99e79fc0ce6ee8 (patch) | |
| tree | b1d7f7414eebc7f7384c2445ba842a72755f16ea /src/liblzma/common/stream_encoder_mt.c | |
| parent | xz: Validate Uncompressed Size from Block Header in list.c. (diff) | |
| download | xz-46540e4c10923e363741ff5aab99e79fc0ce6ee8.tar.xz | |
liblzma: Avoid a warning about a shadowed variable.
On Mac OS X wait() is declared in <sys/wait.h> that
we include one way or other so don't use "wait" as
a variable name.
Thanks to Christian Kujau.
Diffstat (limited to '')
| -rw-r--r-- | src/liblzma/common/stream_encoder_mt.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/liblzma/common/stream_encoder_mt.c b/src/liblzma/common/stream_encoder_mt.c index cd7b291d..f9bd6a10 100644 --- a/src/liblzma/common/stream_encoder_mt.c +++ b/src/liblzma/common/stream_encoder_mt.c @@ -420,7 +420,7 @@ worker_start(void *thr_ptr) /// Make the threads stop but not exit. Optionally wait for them to stop. static void -threads_stop(lzma_coder *coder, bool wait) +threads_stop(lzma_coder *coder, bool wait_for_threads) { // Tell the threads to stop. for (uint32_t i = 0; i < coder->threads_initialized; ++i) { @@ -430,7 +430,7 @@ threads_stop(lzma_coder *coder, bool wait) } } - if (!wait) + if (!wait_for_threads) return; // Wait for the threads to settle in the idle state. |