Merge remote-tracking branch 'origin/mdb.RE/0.9'

[openldap] / include / ldap_int_thread.h

diff --git a/include/ldap_int_thread.h b/include/ldap_int_thread.h
index 58ac0d2af42caf3fce724347e25f7940e59cf1c2..555503b6fe0bd37e5f44975e66871978d10097fa 100644 (file)
--- a/include/ldap_int_thread.h
+++ b/include/ldap_int_thread.h
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  * 
- * Copyright 1998-2014 The OpenLDAP Foundation.
+ * Copyright 1998-2017 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -23,6 +23,9 @@ LDAP_F(int) ldap_int_thread_destroy    LDAP_P(( void ));
 
 LDAP_END_DECL
 
+LDAP_BEGIN_DECL
+typedef struct ldap_int_thread_rmutex_s * ldap_int_thread_rmutex_t;
+LDAP_END_DECL
 
 #ifndef _LDAP_INT_THREAD_H
 #define _LDAP_INT_THREAD_H
@@ -41,7 +44,9 @@ LDAP_END_DECL
 
 LDAP_BEGIN_DECL
 
+#define LDAP_THREAD_HAVE_NATIVE_RECURSIVE_MUTEX
 typedef pthread_t              ldap_int_thread_t;
+typedef pthread_mutex_t                ldap_int_thread_mutex_recursive_t;
 typedef pthread_mutex_t                ldap_int_thread_mutex_t;
 typedef pthread_cond_t         ldap_int_thread_cond_t;
 typedef pthread_key_t          ldap_int_thread_key_t;
@@ -92,6 +97,7 @@ LDAP_END_DECL
 LDAP_BEGIN_DECL
 
 typedef cthread_t              ldap_int_thread_t;
+typedef ldap_int_thread_rmutex_t               ldap_int_thread_mutex_recursive_t;
 typedef struct mutex           ldap_int_thread_mutex_t;
 typedef struct condition       ldap_int_thread_cond_t;
 typedef cthread_key_t          ldap_int_thread_key_t;
@@ -115,7 +121,9 @@ LDAP_END_DECL
 
 LDAP_BEGIN_DECL
 
+#define LDAP_THREAD_HAVE_NATIVE_RECURSIVE_MUTEX
 typedef pth_t          ldap_int_thread_t;
+typedef pth_mutex_t    ldap_int_thread_mutex_recursive_t;
 typedef pth_mutex_t    ldap_int_thread_mutex_t;
 typedef pth_cond_t     ldap_int_thread_cond_t;
 typedef pth_key_t      ldap_int_thread_key_t;
@@ -144,7 +152,9 @@ LDAP_END_DECL
 
 LDAP_BEGIN_DECL
 
+#define LDAP_THREAD_HAVE_NATIVE_RECURSIVE_MUTEX
 typedef thread_t               ldap_int_thread_t;
+typedef mutex_t                        ldap_int_thread_mutex_recursive_t;
 typedef mutex_t                        ldap_int_thread_mutex_t;
 typedef cond_t                 ldap_int_thread_cond_t;
 typedef thread_key_t   ldap_int_thread_key_t;
@@ -175,7 +185,9 @@ typedef thread_key_t        ldap_int_thread_key_t;
 
 LDAP_BEGIN_DECL
 
+#define LDAP_THREAD_HAVE_NATIVE_RECURSIVE_MUTEX
 typedef unsigned long  ldap_int_thread_t;
+typedef HANDLE ldap_int_thread_mutex_recursive_t;
 typedef HANDLE ldap_int_thread_mutex_t;
 typedef HANDLE ldap_int_thread_cond_t;
 typedef DWORD  ldap_int_thread_key_t;
@@ -202,7 +214,9 @@ LDAP_END_DECL
 
 LDAP_BEGIN_DECL
 
+#define LDAP_THREAD_HAVE_NATIVE_RECURSIVE_MUTEX
 typedef int                    ldap_int_thread_t;
+typedef int                    ldap_int_thread_mutex_recursive_t;
 typedef int                    ldap_int_thread_mutex_t;
 typedef int                    ldap_int_thread_cond_t;
 typedef int                    ldap_int_thread_key_t;
@@ -236,8 +250,6 @@ LDAP_F(int) ldap_int_thread_pool_shutdown ( void );
 #ifndef LDAP_THREAD_HAVE_TPOOL
 typedef struct ldap_int_thread_pool_s * ldap_int_thread_pool_t;
 #endif
-
-typedef struct ldap_int_thread_rmutex_s * ldap_int_thread_rmutex_t;
 LDAP_END_DECL