Add LDAP_TAG_LDAPCRED macro.

[openldap] / include / ldap_pvt_thread.h

diff --git a/include/ldap_pvt_thread.h b/include/ldap_pvt_thread.h
index 6024713bbc70e377f12be3e42f30ab2bc4440d16..e64c0ce6e7f82880fb58e4d8839bcca56f080f1a 100644 (file)
--- a/include/ldap_pvt_thread.h
+++ b/include/ldap_pvt_thread.h
@@ -108,11 +108,11 @@ LDAP_BEGIN_DECL
 
 typedef thread_t               ldap_pvt_thread_t;
 typedef mon_t                  ldap_pvt_thread_mutex_t;
-struct lwpcv {
+struct ldap_pvt_thread_lwp_cv {
        int             lcv_created;
        cv_t            lcv_cv;
 };
-typedef struct lwpcv           ldap_pvt_thread_cond_t;
+typedef struct ldap_pvt_thread_lwp_cv ldap_pvt_thread_cond_t;
 
 #define HAVE_REENTRANT_FUNCTIONS 1
 
@@ -120,14 +120,15 @@ LDAP_END_DECL
 
 #elif HAVE_NT_THREADS
 
-#include <windows.h>
-#include <process.h>
-
 LDAP_BEGIN_DECL
 
-typedef HANDLE                 ldap_pvt_thread_t;
-typedef HANDLE                 ldap_pvt_thread_mutex_t;
-typedef HANDLE                 ldap_pvt_thread_cond_t;
+#define WIN32_LEAN_AND_MEAN
+#include <process.h>
+#include <windows.h>
+
+typedef unsigned long  ldap_pvt_thread_t;
+typedef HANDLE ldap_pvt_thread_mutex_t;
+typedef HANDLE ldap_pvt_thread_cond_t;
 
 LDAP_END_DECL
 
@@ -154,84 +155,83 @@ LDAP_END_DECL
 
 #endif /* no threads support */
 
-#ifndef NO_THREADS
-#      define HAVE_THREADS 1
-
-#endif
-
 LDAP_BEGIN_DECL
 
-LDAP_F int
+LDAP_F( int )
 ldap_pvt_thread_initialize LDAP_P(( void ));
 
-LDAP_F unsigned int
+LDAP_F( int )
+ldap_pvt_thread_destroy LDAP_P(( void ));
+
+LDAP_F( unsigned int )
 ldap_pvt_thread_sleep LDAP_P(( unsigned int s ));
 
 #ifdef HAVE_GETCONCURRENCY
-LDAP_F int
+LDAP_F( int )
 ldap_pvt_thread_get_concurrency LDAP_P(( void ));
 #endif
+
 #ifdef HAVE_SETCONCURRENCY
 #      ifndef LDAP_THREAD_CONCURRENCY
        /* three concurrent threads should be enough */
 #      define LDAP_THREAD_CONCURRENCY  3
 #      endif
-LDAP_F int
+LDAP_F( int )
 ldap_pvt_thread_set_concurrency LDAP_P(( int ));
 #endif
 
 #define LDAP_PVT_THREAD_CREATE_JOINABLE 0
 #define LDAP_PVT_THREAD_CREATE_DETACHED 1
 
-LDAP_F int 
+LDAP_F( int ) 
 ldap_pvt_thread_create LDAP_P((
        ldap_pvt_thread_t * thread, 
        int     detach,
        void *(*start_routine)( void * ), 
        void *arg));
 
-LDAP_F void 
+LDAP_F( void ) 
 ldap_pvt_thread_exit LDAP_P(( void *retval ));
 
-LDAP_F int 
+LDAP_F( int )
 ldap_pvt_thread_join LDAP_P(( ldap_pvt_thread_t thread, void **status ));
 
-LDAP_F int 
+LDAP_F( int )
 ldap_pvt_thread_kill LDAP_P(( ldap_pvt_thread_t thread, int signo ));
 
-LDAP_F int 
+LDAP_F( int )
 ldap_pvt_thread_yield LDAP_P(( void ));
 
-LDAP_F int 
+LDAP_F( int )
 ldap_pvt_thread_cond_init LDAP_P(( ldap_pvt_thread_cond_t *cond ));
 
-LDAP_F int 
+LDAP_F( int )
 ldap_pvt_thread_cond_destroy LDAP_P(( ldap_pvt_thread_cond_t *cond ));
 
-LDAP_F int 
+LDAP_F( int )
 ldap_pvt_thread_cond_signal LDAP_P(( ldap_pvt_thread_cond_t *cond ));
 
-LDAP_F int 
+LDAP_F( int )
 ldap_pvt_thread_cond_broadcast LDAP_P(( ldap_pvt_thread_cond_t *cond ));
 
-LDAP_F int 
+LDAP_F( int )
 ldap_pvt_thread_cond_wait LDAP_P((
        ldap_pvt_thread_cond_t *cond, 
        ldap_pvt_thread_mutex_t *mutex ));
 
-LDAP_F int 
+LDAP_F( int )
 ldap_pvt_thread_mutex_init LDAP_P(( ldap_pvt_thread_mutex_t *mutex ));
 
-LDAP_F int 
+LDAP_F( int )
 ldap_pvt_thread_mutex_destroy LDAP_P(( ldap_pvt_thread_mutex_t *mutex ));
 
-LDAP_F int 
+LDAP_F( int )
 ldap_pvt_thread_mutex_lock LDAP_P(( ldap_pvt_thread_mutex_t *mutex ));
 
-LDAP_F int 
+LDAP_F( int )
 ldap_pvt_thread_mutex_trylock LDAP_P(( ldap_pvt_thread_mutex_t *mutex ));
 
-LDAP_F int 
+LDAP_F( int )
 ldap_pvt_thread_mutex_unlock LDAP_P(( ldap_pvt_thread_mutex_t *mutex ));
 
 typedef struct ldap_pvt_thread_rdwr_var {
@@ -239,36 +239,45 @@ typedef struct ldap_pvt_thread_rdwr_var {
        ldap_pvt_thread_cond_t ltrw_read;       /* wait for read */
        ldap_pvt_thread_cond_t ltrw_write;      /* wait for write */
        int ltrw_valid;
-#define LDAP_PVT_THREAD_RDWR_VALUE 0x0bad
+#define LDAP_PVT_THREAD_RDWR_VALID 0x0bad
        int ltrw_r_active;
        int ltrw_w_active;
        int ltrw_r_wait;
        int ltrw_w_wait;
 } ldap_pvt_thread_rdwr_t;
 
-LDAP_F int 
+LDAP_F( int )
 ldap_pvt_thread_rdwr_init LDAP_P((ldap_pvt_thread_rdwr_t *rdwrp));
-LDAP_F int 
+
+LDAP_F( int )
 ldap_pvt_thread_rdwr_destroy LDAP_P((ldap_pvt_thread_rdwr_t *rdwrp));
-LDAP_F int 
+
+LDAP_F( int )
 ldap_pvt_thread_rdwr_rlock LDAP_P((ldap_pvt_thread_rdwr_t *rdwrp));
-LDAP_F int 
+
+LDAP_F( int )
 ldap_pvt_thread_rdwr_rtrylock LDAP_P((ldap_pvt_thread_rdwr_t *rdwrp));
-LDAP_F int 
+
+LDAP_F( int )
 ldap_pvt_thread_rdwr_runlock LDAP_P((ldap_pvt_thread_rdwr_t *rdwrp));
-LDAP_F int 
+
+LDAP_F( int )
 ldap_pvt_thread_rdwr_wlock LDAP_P((ldap_pvt_thread_rdwr_t *rdwrp));
-LDAP_F int 
+
+LDAP_F( int )
 ldap_pvt_thread_rdwr_wtrylock LDAP_P((ldap_pvt_thread_rdwr_t *rdwrp));
-LDAP_F int 
+
+LDAP_F( int )
 ldap_pvt_thread_rdwr_wunlock LDAP_P((ldap_pvt_thread_rdwr_t *rdwrp));
 
 #ifdef LDAP_DEBUG
-LDAP_F int 
+LDAP_F( int )
 ldap_pvt_thread_rdwr_readers LDAP_P((ldap_pvt_thread_rdwr_t *rdwrp));
-LDAP_F int 
+
+LDAP_F( int )
 ldap_pvt_thread_rdwr_writers LDAP_P((ldap_pvt_thread_rdwr_t *rdwrp));
-LDAP_F int 
+
+LDAP_F( int )
 ldap_pvt_thread_rdwr_active LDAP_P((ldap_pvt_thread_rdwr_t *rdwrp));
 #endif /* LDAP_DEBUG */