From ef51692a49d58963966adca55c62da9c34c3c7e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Storsj=C3=B6?= Date: Tue, 27 Aug 2013 14:55:06 +0300 Subject: Revert "w32pthread: help compiler figure out undeeded code" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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ö --- compat/w32pthreads.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'compat') 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; } -- cgit v1.1