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

w32pthread: help compiler figure out undeeded code 

The emulation code is not needed when targetting Vista+
This helps getting rid of CreateSemaphore symbol, which is
forbidden in Windows Store apps.

Signed-off-by: Martin Storsjö <martin@martin.st>
This commit is contained in:
Rafaël Carré 2013-08-20 19:25:22 +02:00 committed by Martin Storsjö
parent 0b45269c2d
commit 4622f11f9c
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

@ -129,7 +129,7 @@ typedef struct win32_cond_t {
static void pthread_cond_init(pthread_cond_t *cond, const void *unused_attr) static void pthread_cond_init(pthread_cond_t *cond, const void *unused_attr)
{ {
win32_cond_t *win32_cond = NULL; win32_cond_t *win32_cond = NULL;
if (cond_init) { if (_WIN32_WINNT >= 0x0600 || cond_init) {
cond_init(cond); cond_init(cond);
return; return;
} }
@ -154,7 +154,7 @@ static void pthread_cond_destroy(pthread_cond_t *cond)
{ {
win32_cond_t *win32_cond = cond->ptr; win32_cond_t *win32_cond = cond->ptr;
/* native condition variables do not destroy */ /* native condition variables do not destroy */
if (cond_init) if (_WIN32_WINNT >= 0x0600 || cond_init)
return; return;
/* non native condition variables */ /* non native condition variables */
@ -171,7 +171,7 @@ static void pthread_cond_broadcast(pthread_cond_t *cond)
win32_cond_t *win32_cond = cond->ptr; win32_cond_t *win32_cond = cond->ptr;
int have_waiter; int have_waiter;
if (cond_broadcast) { if (_WIN32_WINNT >= 0x0600 || cond_broadcast) {
cond_broadcast(cond); cond_broadcast(cond);
return; return;
} }
@ -201,7 +201,7 @@ static int pthread_cond_wait(pthread_cond_t *cond, pthread_mutex_t *mutex)
{ {
win32_cond_t *win32_cond = cond->ptr; win32_cond_t *win32_cond = cond->ptr;
int last_waiter; int last_waiter;
if (cond_wait) { if (_WIN32_WINNT >= 0x0600 || cond_wait) {
cond_wait(cond, mutex, INFINITE); cond_wait(cond, mutex, INFINITE);
return 0; return 0;
} }
@ -233,7 +233,7 @@ static void pthread_cond_signal(pthread_cond_t *cond)
{ {
win32_cond_t *win32_cond = cond->ptr; win32_cond_t *win32_cond = cond->ptr;
int have_waiter; int have_waiter;
if (cond_signal) { if (_WIN32_WINNT >= 0x0600 || cond_signal) {
cond_signal(cond); cond_signal(cond);
return; return;
} }