| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-22 11:09:00 (GMT) |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-22 11:09:24 (GMT) |
| commit | 221a99aae767961c7567dc222f74b778581c9458 (patch) | |
| tree | 7f39367a9be63b4c6213fb48e20d6d016eea6938 | |
| parent | 503aec142526b3cc6fd67779f40600fe7ddfe162 (diff) | |
| parent | 4622f11f9c83db8a2e08408c71ff901826ca652c (diff) | |
| download | ffmpeg-221a99aae767961c7567dc222f74b778581c9458.zip ffmpeg-221a99aae767961c7567dc222f74b778581c9458.tar.gz ffmpeg-221a99aae767961c7567dc222f74b778581c9458.tar.bz2 | |
Merge commit '4622f11f9c83db8a2e08408c71ff901826ca652c'
* commit '4622f11f9c83db8a2e08408c71ff901826ca652c':
w32pthread: help compiler figure out undeeded code
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -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 71806cc..4b6924f 100644 --- a/compat/w32pthreads.h +++ b/compat/w32pthreads.h @@ -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; } |