diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2012-04-03 17:36:49 -0400 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2012-04-04 13:02:34 -0400 |
| commit | 6da08c9986bf016dcf951dc39aeb45b61b32a1ac (patch) | |
| tree | 48c4535bbd059100c35bd0093d1a17ce61cf8498 | |
| parent | c22fd9bd9c2ac06e5960529a30a994141b2d03b1 (diff) | |
| download | ffmpeg-6da08c9986bf016dcf951dc39aeb45b61b32a1ac.tar.gz | |
w32threads: Make pthread_cond_wait follow POSIX
pthread_cond_wait is supposed to return an integer,
and indeed does sometimes. Fix its function declaration
to match its behavior and POSIX.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| -rw-r--r-- | libavcodec/w32pthreads.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/w32pthreads.h b/libavcodec/w32pthreads.h index 70b84cf2e1..ae6ceb91f8 100644 --- a/libavcodec/w32pthreads.h +++ b/libavcodec/w32pthreads.h @@ -194,13 +194,13 @@ static void pthread_cond_broadcast(pthread_cond_t *cond) pthread_mutex_unlock(&win32_cond->mtx_broadcast); } -static void pthread_cond_wait(pthread_cond_t *cond, pthread_mutex_t *mutex) +static int pthread_cond_wait(pthread_cond_t *cond, pthread_mutex_t *mutex) { win32_cond_t *win32_cond = cond->ptr; int last_waiter; if (cond_wait) { cond_wait(cond, mutex, INFINITE); - return; + return 0; } /* non native condition variables */ |