Fix up NT port after thread changes

diff --git a/libraries/libldap_r/libldap_r.dsp b/libraries/libldap_r/libldap_r.dsp
index 86e5329c8823078b548a4c6078e301ff4cbcf9d7..1cf359ae8bb0c2a7f8896272c59e7944cb64ea88 100644 (file)
--- a/libraries/libldap_r/libldap_r.dsp
+++ b/libraries/libldap_r/libldap_r.dsp
@@ -281,6 +281,7 @@ SOURCE=..\libldap\print.c
 # Begin Source File
 
 SOURCE=.\rdwr.c
+# ADD CPP /I "..\libldap"
 # End Source File
 # Begin Source File
 
@@ -332,10 +333,6 @@ SOURCE=.\thr_nt.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\thr_sleep.c
-# End Source File
-# Begin Source File
-
 SOURCE=.\thr_stub.c
 # End Source File
 # Begin Source File
@@ -348,6 +345,15 @@ SOURCE=..\libldap\tls.c
 # End Source File
 # Begin Source File
 
+SOURCE=..\libldap\tmplout.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\tpool.c
+# ADD CPP /I "..\libldap"
+# End Source File
+# Begin Source File
+
 SOURCE=..\libldap\ufn.c
 # End Source File
 # Begin Source File

diff --git a/libraries/libldap_r/threads.c b/libraries/libldap_r/threads.c
index 9f845fe953e47676c6905421d7438ac33e905fbe..3ac48498e7ac9c44f96473d357efc03e7b68cca4 100644 (file)
--- a/libraries/libldap_r/threads.c
+++ b/libraries/libldap_r/threads.c
@@ -52,7 +52,7 @@ int ldap_pvt_thread_destroy( void )
 #ifndef LDAP_THREAD_HAVE_TPOOL
        (void) ldap_int_thread_pool_shutdown();
 #endif
-       (void) ldap_int_thread_destroy();
+       return ldap_int_thread_destroy();
 }
 
 #ifndef LDAP_THREAD_HAVE_GETCONCURRENCY