ITS#5780

[openldap] / include / ldap_pvt_thread.h

diff --git a/include/ldap_pvt_thread.h b/include/ldap_pvt_thread.h
index e8a8b08dbfd777a4f1d029b417816bb9a592c85d..1325e77226716024999e4f09125f2b0de811fdef 100644 (file)
--- a/include/ldap_pvt_thread.h
+++ b/include/ldap_pvt_thread.h
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  * 
- * Copyright 1998-2007 The OpenLDAP Foundation.
+ * Copyright 1998-2008 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -243,10 +243,18 @@ ldap_pvt_thread_pool_query LDAP_P((
        ldap_pvt_thread_pool_t *pool,
        ldap_pvt_thread_pool_param_t param, void *value ));
 
+LDAP_F( int )
+ldap_pvt_thread_pool_pausing LDAP_P((
+       ldap_pvt_thread_pool_t *pool ));
+
 LDAP_F( int )
 ldap_pvt_thread_pool_backload LDAP_P((
        ldap_pvt_thread_pool_t *pool ));
 
+LDAP_F( int )
+ldap_pvt_thread_pool_pausecheck LDAP_P((
+       ldap_pvt_thread_pool_t *pool ));
+
 LDAP_F( int )
 ldap_pvt_thread_pool_pause LDAP_P((
        ldap_pvt_thread_pool_t *pool ));
@@ -268,7 +276,7 @@ ldap_pvt_thread_pool_getkey LDAP_P((
        ldap_pvt_thread_pool_keyfree_t **kfree ));
 
 LDAP_F( int )
-ldap_pvt_thread_pool_setkey_x LDAP_P((
+ldap_pvt_thread_pool_setkey LDAP_P((
        void *ctx,
        void *key,
        void *data,
@@ -276,9 +284,6 @@ ldap_pvt_thread_pool_setkey_x LDAP_P((
        void **olddatap,
        ldap_pvt_thread_pool_keyfree_t **oldkfreep ));
 
-#define ldap_pvt_thread_pool_setkey( ctx, key, data, kfree ) \
-       ldap_pvt_thread_pool_setkey_x( (ctx), (key), (data), (kfree), NULL, NULL )
-
 LDAP_F( void )
 ldap_pvt_thread_pool_purgekey LDAP_P(( void *key ));