RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit 'ef51692a49d58963966adca55c62da9c34c3c7e1' 

* commit 'ef51692a49d58963966adca55c62da9c34c3c7e1':
  Revert "w32pthread: help compiler figure out undeeded code"

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-08-28 12:46:08 +02:00
parent a8ddafb0f4 ef51692a49
commit 983ed20c1c
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
compat/w32pthreads.h
View File

@ -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;
}