Revert "w32pthread: help compiler figure out undeeded code"

This reverts commit 4622f11. 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ö <[email protected]>
zhengxj91 · Aug 27, 2013 · ef51692 · ef51692
1 parent 4332bf9
commit ef51692
Showing 1 changed file with 5 additions and 5 deletions.
diff --git 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;
  }