From 650837742a370297fea400b8d9dbadaca684de84 Mon Sep 17 00:00:00 2001 From: Howard Chu Date: Wed, 17 Mar 2004 05:06:04 +0000 Subject: [PATCH] Restore NT4 compatibility, avoid W2K-only API --- libraries/libldap_r/thr_nt.c | 34 ++++++++++++++++++++++++++++------ 1 file changed, 28 insertions(+), 6 deletions(-) diff --git a/libraries/libldap_r/thr_nt.c b/libraries/libldap_r/thr_nt.c index a68d2608e4..8b7a7f60e9 100644 --- a/libraries/libldap_r/thr_nt.c +++ b/libraries/libldap_r/thr_nt.c @@ -20,6 +20,19 @@ #include "ldap_pvt_thread.h" +typedef struct ldap_int_thread_s { + long tid; + HANDLE thd; +} ldap_int_thread_s; + +#ifndef NT_MAX_THREADS +#define NT_MAX_THREADS 1024 +#endif + +static ldap_int_thread_s tid[NT_MAX_THREADS]; +static int ntids; + + /* mingw compiler very sensitive about getting prototypes right */ typedef unsigned __stdcall thrfunc_t(void *); @@ -50,7 +63,9 @@ ldap_pvt_thread_create( ldap_pvt_thread_t * thread, if ( thd ) { *thread = (ldap_pvt_thread_t) tid; - CloseHandle( thd ); + tid[ntids].tid = tid; + tid[ntids].thd = thd; + ntids++; rc = 0; } return rc; @@ -66,12 +81,19 @@ int ldap_pvt_thread_join( ldap_pvt_thread_t thread, void **thread_return ) { DWORD status; - HANDLE thd; - HANDLE __stdcall OpenThread( int, int, int ); + int i; - thd = OpenThread( SYNCHRONIZE, 0, thread ); - status = WaitForSingleObject( thd, INFINITE ); - CloseHandle( thd ); + for (i=0; i ntids ) return -1; + + status = WaitForSingleObject( tid[i].thd, INFINITE ); + for (; i