summaryrefslogtreecommitdiffstats
path: root/compat
diff options
context:
space:
mode:
authorMartin Storsjö <martin@martin.st>2013-08-27 14:55:06 +0300
committerMartin Storsjö <martin@martin.st>2013-08-27 23:12:49 +0300
commitef51692a49d58963966adca55c62da9c34c3c7e1 (patch)
tree44c2a0e67c65c4473d8901bcca4fe30c33818b9f /compat
parent4332bf98dc051fd1ffbd9d4ddc1c5e55790c96f1 (diff)
downloadffmpeg-streaming-ef51692a49d58963966adca55c62da9c34c3c7e1.zip
ffmpeg-streaming-ef51692a49d58963966adca55c62da9c34c3c7e1.tar.gz
Revert "w32pthread: help compiler figure out undeeded code"
This reverts commit 4622f11f9c83db8a2e08408c71ff901826ca652c. The compiler should be able to do the dead code elimination now without this when the cond_* names point directly to the real functions instead of to local function pointers. Signed-off-by: Martin Storsjö <martin@martin.st>
Diffstat (limited to 'compat')
-rw-r--r--compat/w32pthreads.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/compat/w32pthreads.h b/compat/w32pthreads.h
index a2b72a4..be275ed 100644
--- a/compat/w32pthreads.h
+++ b/compat/w32pthreads.h
@@ -136,7 +136,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;
}
@@ -161,7 +161,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 */
@@ -178,7 +178,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;
}
@@ -208,7 +208,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;
}
@@ -240,7 +240,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;
}
OpenPOWER on IntegriCloud