Diff for /include/ldap_int_thread.h between versions 1.31 and 1.32

version 1.31, 2010/10/12 08:26:32 version 1.32, 2010/10/22 19:45:48
Line 1 Line 1
 /* ldap_int_thread.h - ldap internal thread wrappers header file */  /* ldap_int_thread.h - ldap internal thread wrappers header file */
 /* $OpenLDAP: pkg/ldap/include/ldap_int_thread.h,v 1.30 2010/04/13 20:17:49 kurt Exp $ */  /* $OpenLDAP: pkg/ldap/include/ldap_int_thread.h,v 1.31 2010/10/12 08:26:32 hyc Exp $ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.  /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *    * 
  * Copyright 1998-2010 The OpenLDAP Foundation.   * Copyright 1998-2010 The OpenLDAP Foundation.
Line 69  typedef pthread_key_t  ldap_int_thread_k Line 69  typedef pthread_key_t  ldap_int_thread_k
 typedef pthread_rwlock_t ldap_int_thread_rdwr_t;  typedef pthread_rwlock_t ldap_int_thread_rdwr_t;
 #endif  #endif
   
   #ifndef LDO_MUTEX_NULL
   #define LDO_MUTEX_NULL  ,PTHREAD_MUTEX_INITIALIZER
   #define MUTEX_FIRSTCREATE(m)
   #endif
   
 LDAP_END_DECL  LDAP_END_DECL
   
 #elif defined ( HAVE_MACH_CTHREADS )  #elif defined ( HAVE_MACH_CTHREADS )
Line 91  typedef struct mutex  ldap_int_thread_mu Line 96  typedef struct mutex  ldap_int_thread_mu
 typedef struct condition        ldap_int_thread_cond_t;  typedef struct condition        ldap_int_thread_cond_t;
 typedef cthread_key_t           ldap_int_thread_key_t;  typedef cthread_key_t           ldap_int_thread_key_t;
   
   #ifndef LDO_MUTEX_NULL
   #define LDO_MUTEX_NULL  ,MUTEX_INITIALIZER
   #define MUTEX_FIRSTCREATE(m)
   #endif
   
 LDAP_END_DECL  LDAP_END_DECL
   
 #elif defined( HAVE_GNU_PTH )  #elif defined( HAVE_GNU_PTH )
Line 115  typedef pth_key_t ldap_int_thread_key_t; Line 125  typedef pth_key_t ldap_int_thread_key_t;
 typedef pth_rwlock_t ldap_int_thread_rdwr_t;  typedef pth_rwlock_t ldap_int_thread_rdwr_t;
 #endif  #endif
   
   #ifndef LDO_MUTEX_NULL
   #define LDO_MUTEX_NULL  ,PTH_MUTEX_INIT
   #define MUTEX_FIRSTCREATE(m)
   #endif
   
 LDAP_END_DECL  LDAP_END_DECL
   
 #elif defined( HAVE_THR )  #elif defined( HAVE_THR )
Line 143  typedef thread_key_t ldap_int_thread_key Line 158  typedef thread_key_t ldap_int_thread_key
 #define LDAP_THREAD_HAVE_SETCONCURRENCY 1  #define LDAP_THREAD_HAVE_SETCONCURRENCY 1
 #endif  #endif
   
 LDAP_END_DECL  #ifndef LDO_MUTEX_NULL
   #define LDO_MUTEX_NULL  ,DEFAULTMUTEX
   #define MUTEX_FIRSTCREATE(m)
   #endif
   
 #elif defined(HAVE_NT_THREADS)  #elif defined(HAVE_NT_THREADS)
 /*************************************  /*************************************
Line 162  typedef HANDLE ldap_int_thread_mutex_t; Line 180  typedef HANDLE ldap_int_thread_mutex_t;
 typedef HANDLE  ldap_int_thread_cond_t;  typedef HANDLE  ldap_int_thread_cond_t;
 typedef DWORD   ldap_int_thread_key_t;  typedef DWORD   ldap_int_thread_key_t;
   
   #ifndef LDO_MUTEX_NULL
   #define LDO_MUTEX_NULL          ,(HANDLE)0
   #define MUTEX_FIRSTCREATE(m)    (!m ? 0 : ldap_pvt_thread_mutex_init(&m) )
   #endif
   
 LDAP_END_DECL  LDAP_END_DECL
   
 #else  #else
Line 186  typedef int   ldap_int_thread_key_t; Line 209  typedef int   ldap_int_thread_key_t;
 #define LDAP_THREAD_HAVE_TPOOL 1  #define LDAP_THREAD_HAVE_TPOOL 1
 typedef int                     ldap_int_thread_pool_t;  typedef int                     ldap_int_thread_pool_t;
   
   #ifndef LDO_MUTEX_NULL
   #define LDO_MUTEX_NULL
   #define MUTEX_FIRSTCREATE(m)
   #endif
   
 LDAP_END_DECL  LDAP_END_DECL
   
 #endif /* no threads support */  #endif /* no threads support */

Removed from v.1.31  
changed lines
  Added in v.1.32


______________
© Copyright 1998-2020, OpenLDAP Foundation, info@OpenLDAP.org