fix format

[openldap] / libraries / libldap_r / thr_nt.c

diff --git a/libraries/libldap_r/thr_nt.c b/libraries/libldap_r/thr_nt.c
index 8b7a7f60e935b7e821e7f96aa3345f5b5740a253..f3d0755de99941f3a78f237b3c40a6d4349c9330 100644 (file)
--- a/libraries/libldap_r/thr_nt.c
+++ b/libraries/libldap_r/thr_nt.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2004 The OpenLDAP Foundation.
+ * Copyright 1998-2007 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -18,7 +18,13 @@
 
 #if defined( HAVE_NT_THREADS )
 
-#include "ldap_pvt_thread.h"
+#define _WIN32_WINNT 0x0400
+#include <windows.h>
+#include <process.h>
+
+#include "ldap_pvt_thread.h" /* Get the thread interface */
+#define LDAP_THREAD_IMPLEMENTATION
+#include "ldap_thr_debug.h"     /* May rename the symbols defined below */
 
 typedef struct ldap_int_thread_s {
        long tid;
@@ -29,7 +35,7 @@ typedef struct ldap_int_thread_s {
 #define NT_MAX_THREADS 1024
 #endif
 
-static ldap_int_thread_s tid[NT_MAX_THREADS];
+static ldap_int_thread_s tids[NT_MAX_THREADS];
 static int ntids;
 
 
@@ -63,8 +69,8 @@ ldap_pvt_thread_create( ldap_pvt_thread_t * thread,
 
        if ( thd ) {
                *thread = (ldap_pvt_thread_t) tid;
-               tid[ntids].tid = tid;
-               tid[ntids].thd = thd;
+               tids[ntids].tid = tid;
+               tids[ntids].thd = thd;
                ntids++;
                rc = 0;
        }
@@ -84,14 +90,14 @@ ldap_pvt_thread_join( ldap_pvt_thread_t thread, void **thread_return )
        int i;
 
        for (i=0; i<ntids; i++) {
-               if ( tid[i].tid == thread )
+               if ( tids[i].tid == thread )
                        break;
        }
        if ( i > ntids ) return -1;
 
-       status = WaitForSingleObject( tid[i].thd, INFINITE );
+       status = WaitForSingleObject( tids[i].thd, INFINITE );
        for (; i<ntids; i++) {
-               tid[i] = tid[i+1];
+               tids[i] = tids[i+1];
        }
        ntids--;
        return status == WAIT_FAILED ? -1 : 0;