root
/
xz
mirror of https://git.tukaani.org/xz.git
1
0
Fork 0
Code Issues Releases Wiki Activity

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.
This commit is contained in:
Lasse Collin 2013-06-23 18:57:23 +03:00
parent ebb501ec73
commit 46540e4c10
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/liblzma/common/stream_encoder_mt.c
View File

@ -420,7 +420,7 @@ worker_start(void *thr_ptr)
/// Make the threads stop but not exit. Optionally wait for them to stop. /// Make the threads stop but not exit. Optionally wait for them to stop.
static void static void
threads_stop(lzma_coder *coder, bool wait) threads_stop(lzma_coder *coder, bool wait_for_threads)
{ {
// Tell the threads to stop. // Tell the threads to stop.
for (uint32_t i = 0; i < coder->threads_initialized; ++i) { 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; return;
// Wait for the threads to settle in the idle state. // Wait for the threads to settle in the idle state.