Cyrus SASL uses screwy terms.

[openldap] / libraries / libldap_r / thr_nt.c

diff --git a/libraries/libldap_r/thr_nt.c b/libraries/libldap_r/thr_nt.c
index a9b72b2e77c50b7251b1eee6bde4ed420e3be134..42134362710b57d6bab65a1fa26d78c8f000e7af 100644 (file)
--- a/libraries/libldap_r/thr_nt.c
+++ b/libraries/libldap_r/thr_nt.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright 1998,1999 The OpenLDAP Foundation, Redwood City, California, USA
  * All rights reserved.
@@ -11,10 +12,11 @@
 /* thr_nt.c - wrapper around NT threads */
 
 #include "portable.h"
-#include "ldap_pvt_thread.h"
 
 #if defined( HAVE_NT_THREADS )
 
+#include "ldap_pvt_thread.h"
+
 int
 ldap_pvt_thread_initialize( void )
 {
@@ -64,6 +66,7 @@ ldap_pvt_thread_kill( ldap_pvt_thread_t thread, int signo )
 int 
 ldap_pvt_thread_yield( void )
 {
+       Sleep( 0 );
        return 0;
 }
 
@@ -93,15 +96,15 @@ ldap_pvt_thread_cond_wait( ldap_pvt_thread_cond_t *cond,
                          ldap_pvt_thread_mutex_t *mutex )
 {
        ReleaseMutex( *mutex );
-       WaitForSingleObject( *cond, INFINITE );
+       SignalObjectAndWait( *mutex, *cond, INFINITE, FALSE );
        WaitForSingleObject( *mutex, INFINITE );
        return( 0 );
 }
 
 int
-ldap_pvt_thread_cond_broadcast( ldap_pvt_thread_cond_t *cv )
+ldap_pvt_thread_cond_broadcast( ldap_pvt_thread_cond_t *cond )
 {
-       SetEvent( *cv );
+       SetEvent( *cond );
        return( 0 );
 }