diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-28 12:46:08 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-28 12:46:12 +0200 |
| commit | 983ed20c1cc6b3358cf536fe1c778533a8c50c27 (patch) | |
| tree | a09b0f0989d6a868b3900dd2c739fac0e068c843 /compat | |
| parent | a8ddafb0f418084ff0471a81cd60adf0de51a63d (diff) | |
| parent | ef51692a49d58963966adca55c62da9c34c3c7e1 (diff) | |
| download | ffmpeg-streaming-983ed20c1cc6b3358cf536fe1c778533a8c50c27.zip ffmpeg-streaming-983ed20c1cc6b3358cf536fe1c778533a8c50c27.tar.gz | |
Merge commit 'ef51692a49d58963966adca55c62da9c34c3c7e1'
* commit 'ef51692a49d58963966adca55c62da9c34c3c7e1':
Revert "w32pthread: help compiler figure out undeeded code"
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'compat')
| -rw-r--r-- | compat/w32pthreads.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/compat/w32pthreads.h b/compat/w32pthreads.h index afe5b33..7b51c25 100644 --- a/compat/w32pthreads.h +++ b/compat/w32pthreads.h @@ -137,7 +137,7 @@ typedef struct win32_cond_t { static void pthread_cond_init(pthread_cond_t *cond, const void *unused_attr) { win32_cond_t *win32_cond = NULL; - if (_WIN32_WINNT >= 0x0600 || cond_init) { + if (cond_init) { cond_init(cond); return; } @@ -162,7 +162,7 @@ static void pthread_cond_destroy(pthread_cond_t *cond) { win32_cond_t *win32_cond = cond->ptr; /* native condition variables do not destroy */ - if (_WIN32_WINNT >= 0x0600 || cond_init) + if (cond_init) return; /* non native condition variables */ @@ -179,7 +179,7 @@ static void pthread_cond_broadcast(pthread_cond_t *cond) win32_cond_t *win32_cond = cond->ptr; int have_waiter; - if (_WIN32_WINNT >= 0x0600 || cond_broadcast) { + if (cond_broadcast) { cond_broadcast(cond); return; } @@ -209,7 +209,7 @@ static int pthread_cond_wait(pthread_cond_t *cond, pthread_mutex_t *mutex) { win32_cond_t *win32_cond = cond->ptr; int last_waiter; - if (_WIN32_WINNT >= 0x0600 || cond_wait) { + if (cond_wait) { cond_wait(cond, mutex, INFINITE); return 0; } @@ -241,7 +241,7 @@ static void pthread_cond_signal(pthread_cond_t *cond) { win32_cond_t *win32_cond = cond->ptr; int have_waiter; - if (_WIN32_WINNT >= 0x0600 || cond_signal) { + if (cond_signal) { cond_signal(cond); return; } |
