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

Merge commit '4622f11f9c83db8a2e08408c71ff901826ca652c' 

* commit '4622f11f9c83db8a2e08408c71ff901826ca652c':
  w32pthread: help compiler figure out undeeded code

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-08-22 13:09:00 +02:00
parent 503aec1425 4622f11f9c
commit 221a99aae7
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

@ -130,7 +130,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 (cond_init) {
if (_WIN32_WINNT >= 0x0600 || cond_init) {
cond_init(cond);
return;
}
@ -155,7 +155,7 @@ static void pthread_cond_destroy(pthread_cond_t *cond)
{
win32_cond_t *win32_cond = cond->ptr;
/* native condition variables do not destroy */
if (cond_init)
if (_WIN32_WINNT >= 0x0600 || cond_init)
return;
/* non native condition variables */
@ -172,7 +172,7 @@ static void pthread_cond_broadcast(pthread_cond_t *cond)
win32_cond_t *win32_cond = cond->ptr;
int have_waiter;
if (cond_broadcast) {
if (_WIN32_WINNT >= 0x0600 || cond_broadcast) {
cond_broadcast(cond);
return;
}
@ -202,7 +202,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 (cond_wait) {
if (_WIN32_WINNT >= 0x0600 || cond_wait) {
cond_wait(cond, mutex, INFINITE);
return 0;
}
@ -234,7 +234,7 @@ static void pthread_cond_signal(pthread_cond_t *cond)
{
win32_cond_t *win32_cond = cond->ptr;
int have_waiter;
if (cond_signal) {
if (_WIN32_WINNT >= 0x0600 || cond_signal) {
cond_signal(cond);
return;
}