| Index: third_party/libwebp/utils/thread_utils.c
|
| diff --git a/third_party/libwebp/utils/thread.c b/third_party/libwebp/utils/thread_utils.c
|
| similarity index 98%
|
| rename from third_party/libwebp/utils/thread.c
|
| rename to third_party/libwebp/utils/thread_utils.c
|
| index 93f7622797f05f6acc1126e8296c481d276e4047..1729060c704bb7a6937ad7c6d2b6647da9ce8eb9 100644
|
| --- a/third_party/libwebp/utils/thread.c
|
| +++ b/third_party/libwebp/utils/thread_utils.c
|
| @@ -13,7 +13,7 @@
|
|
|
| #include <assert.h>
|
| #include <string.h> // for memset()
|
| -#include "./thread.h"
|
| +#include "./thread_utils.h"
|
| #include "./utils.h"
|
|
|
| #ifdef WEBP_USE_THREAD
|
| @@ -183,8 +183,7 @@ static int pthread_cond_wait(pthread_cond_t* const condition,
|
| #else
|
| // note that there is a consumer available so the signal isn't dropped in
|
| // pthread_cond_signal
|
| - if (!ReleaseSemaphore(condition->waiting_sem_, 1, NULL))
|
| - return 1;
|
| + if (!ReleaseSemaphore(condition->waiting_sem_, 1, NULL)) return 1;
|
| // now unlock the mutex so pthread_cond_signal may be issued
|
| pthread_mutex_unlock(mutex);
|
| ok = (WaitForSingleObject(condition->signal_event_, INFINITE) ==
|
| @@ -226,8 +225,7 @@ static THREADFN ThreadLoop(void* ptr) {
|
| }
|
|
|
| // main thread state control
|
| -static void ChangeState(WebPWorker* const worker,
|
| - WebPWorkerStatus new_status) {
|
| +static void ChangeState(WebPWorker* const worker, WebPWorkerStatus new_status) {
|
| // No-op when attempting to change state on a thread that didn't come up.
|
| // Checking status_ without acquiring the lock first would result in a data
|
| // race.
|
|
|