Only set URANDOM_DEVICE if undef

[openldap] / libraries / libldap_r / thr_nt.c

diff --git a/libraries/libldap_r/thr_nt.c b/libraries/libldap_r/thr_nt.c
index 14cdecb59ef579c0741fc43d6b59cf53e2c74e05..620da6b642ab8786fd21796dc2994194d5c1b95c 100644 (file)
--- a/libraries/libldap_r/thr_nt.c
+++ b/libraries/libldap_r/thr_nt.c
@@ -15,7 +15,7 @@
 
 #if defined( HAVE_NT_THREADS )
 
-#include "ldap_int_thread.h"
+#include "ldap_pvt_thread.h"
 
 int
 ldap_int_thread_initialize( void )
@@ -30,122 +30,116 @@ ldap_int_thread_destroy( void )
 }
 
 int 
-ldap_int_thread_create( ldap_int_thread_t * thread, 
+ldap_pvt_thread_create( ldap_pvt_thread_t * thread, 
        int detach,
        void *(*start_routine)( void *),
        void *arg)
 {
-       *thread = (ldap_int_thread_t)_beginthread( (void *) start_routine, 
+       *thread = (ldap_pvt_thread_t)_beginthread( (void *) start_routine, 
                                                0, arg );
         return ( (unsigned long)*thread == -1 ? -1 : 0 );
 }
        
 void 
-ldap_int_thread_exit( void *retval )
+ldap_pvt_thread_exit( void *retval )
 {
        _endthread( );
 }
 
 int 
-ldap_int_thread_join( ldap_int_thread_t thread, void **thread_return )
+ldap_pvt_thread_join( ldap_pvt_thread_t thread, void **thread_return )
 {
        DWORD status;
        status = WaitForSingleObject( (HANDLE) thread, INFINITE );
-       if (status == WAIT_FAILED) {
-               return -1;
-       }
-       return 0;
+       return status == WAIT_FAILED ? -1 : 0;
 }
 
 int 
-ldap_int_thread_kill( ldap_int_thread_t thread, int signo )
+ldap_pvt_thread_kill( ldap_pvt_thread_t thread, int signo )
 {
        return 0;
 }
 
 int 
-ldap_int_thread_yield( void )
+ldap_pvt_thread_yield( void )
 {
        Sleep( 0 );
        return 0;
 }
 
 int 
-ldap_int_thread_cond_init( ldap_int_thread_cond_t *cond )
+ldap_pvt_thread_cond_init( ldap_pvt_thread_cond_t *cond )
 {
        *cond = CreateEvent( NULL, FALSE, FALSE, NULL );
        return( 0 );
 }
 
 int
-ldap_int_thread_cond_destroy( ldap_int_thread_cond_t *cv )
+ldap_pvt_thread_cond_destroy( ldap_pvt_thread_cond_t *cv )
 {
        CloseHandle( *cv );
        return( 0 );
 }
 
 int 
-ldap_int_thread_cond_signal( ldap_int_thread_cond_t *cond )
+ldap_pvt_thread_cond_signal( ldap_pvt_thread_cond_t *cond )
 {
        SetEvent( *cond );
        return( 0 );
 }
 
 int 
-ldap_int_thread_cond_wait( ldap_int_thread_cond_t *cond, 
-                         ldap_int_thread_mutex_t *mutex )
+ldap_pvt_thread_cond_wait( ldap_pvt_thread_cond_t *cond, 
+       ldap_pvt_thread_mutex_t *mutex )
 {
-       ReleaseMutex( *mutex );
        SignalObjectAndWait( *mutex, *cond, INFINITE, FALSE );
        WaitForSingleObject( *mutex, INFINITE );
        return( 0 );
 }
 
 int
-ldap_int_thread_cond_broadcast( ldap_int_thread_cond_t *cond )
+ldap_pvt_thread_cond_broadcast( ldap_pvt_thread_cond_t *cond )
 {
        SetEvent( *cond );
        return( 0 );
 }
 
 int 
-ldap_int_thread_mutex_init( ldap_int_thread_mutex_t *mutex )
+ldap_pvt_thread_mutex_init( ldap_pvt_thread_mutex_t *mutex )
 {
        *mutex = CreateMutex( NULL, 0, NULL );
        return ( 0 );
 }
 
 int 
-ldap_int_thread_mutex_destroy( ldap_int_thread_mutex_t *mutex )
+ldap_pvt_thread_mutex_destroy( ldap_pvt_thread_mutex_t *mutex )
 {
        CloseHandle( *mutex );
        return ( 0 );   
 }
 
 int 
-ldap_int_thread_mutex_lock( ldap_int_thread_mutex_t *mutex )
+ldap_pvt_thread_mutex_lock( ldap_pvt_thread_mutex_t *mutex )
 {
-       WaitForSingleObject( *mutex, INFINITE );
-       return ( 0 );
+       DWORD status;
+       status = WaitForSingleObject( *mutex, INFINITE );
+       return status == WAIT_FAILED ? -1 : 0;
 }
 
 int 
-ldap_int_thread_mutex_unlock( ldap_int_thread_mutex_t *mutex )
+ldap_pvt_thread_mutex_unlock( ldap_pvt_thread_mutex_t *mutex )
 {
        ReleaseMutex( *mutex );
        return ( 0 );
 }
 
 int
-ldap_int_thread_mutex_trylock( ldap_int_thread_mutex_t *mp )
+ldap_pvt_thread_mutex_trylock( ldap_pvt_thread_mutex_t *mp )
 {
        DWORD status;
-
        status = WaitForSingleObject( *mp, 0 );
-       if ( (status == WAIT_FAILED) || (status == WAIT_TIMEOUT) )
-               return 0;
-       else
-               return 1;
+       return status == WAIT_FAILED || status == WAIT_TIMEOUT
+               ? -1 : 0;
 }
 
 #endif