aboutsummaryrefslogtreecommitdiff
path: root/pthreads/pthread_spin_destroy.c
diff options
context:
space:
mode:
Diffstat (limited to 'pthreads/pthread_spin_destroy.c')
-rw-r--r--pthreads/pthread_spin_destroy.c15
1 files changed, 7 insertions, 8 deletions
diff --git a/pthreads/pthread_spin_destroy.c b/pthreads/pthread_spin_destroy.c
index 8fe22674d..786c4e34c 100644
--- a/pthreads/pthread_spin_destroy.c
+++ b/pthreads/pthread_spin_destroy.c
@@ -56,12 +56,9 @@ pthread_spin_destroy (pthread_spinlock_t * lock)
result = pthread_mutex_destroy (&(s->u.mutex));
}
else if ((PTW32_INTERLOCKED_LONG) PTW32_SPIN_UNLOCKED !=
- PTW32_INTERLOCKED_COMPARE_EXCHANGE ((PTW32_INTERLOCKED_LPLONG)
- & (s->interlock),
- (PTW32_INTERLOCKED_LONG)
- PTW32_OBJECT_INVALID,
- (PTW32_INTERLOCKED_LONG)
- PTW32_SPIN_UNLOCKED))
+ PTW32_INTERLOCKED_COMPARE_EXCHANGE_LONG ((PTW32_INTERLOCKED_LONGPTR) &s->interlock,
+ (PTW32_INTERLOCKED_LONG) PTW32_SPIN_INVALID,
+ (PTW32_INTERLOCKED_LONG) PTW32_SPIN_UNLOCKED))
{
result = EINVAL;
}
@@ -81,7 +78,9 @@ pthread_spin_destroy (pthread_spinlock_t * lock)
/*
* See notes in ptw32_spinlock_check_need_init() above also.
*/
- EnterCriticalSection (&ptw32_spinlock_test_init_lock);
+ ptw32_mcs_local_node_t node;
+
+ ptw32_mcs_lock_acquire(&ptw32_spinlock_test_init_lock, &node);
/*
* Check again.
@@ -105,7 +104,7 @@ pthread_spin_destroy (pthread_spinlock_t * lock)
result = EBUSY;
}
- LeaveCriticalSection (&ptw32_spinlock_test_init_lock);
+ ptw32_mcs_lock_release(&node);
}
return (result);