Merge remote branch 'origin/mdb.master' into OPENLDAP_REL_ENG_2_4

[openldap] / libraries / libldap_r / ldap_thr_debug.h

diff --git a/libraries/libldap_r/ldap_thr_debug.h b/libraries/libldap_r/ldap_thr_debug.h
index a85ef67e5b1435f9e395397dab8109c94d31c156..ae80e5e495d41ae0f96498572df4208c5b45f4dc 100644 (file)
--- a/libraries/libldap_r/ldap_thr_debug.h
+++ b/libraries/libldap_r/ldap_thr_debug.h
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 2005-2007 The OpenLDAP Foundation.
+ * Copyright 2005-2012 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -119,7 +119,7 @@
 #define        ldap_pvt_thread_pool_resume             ldap_int_thread_pool_resume
 #define        ldap_pvt_thread_pool_destroy    ldap_int_thread_pool_destroy
 #define        ldap_pvt_thread_pool_getkey             ldap_int_thread_pool_getkey
-#define        ldap_pvt_thread_pool_setkey_x   ldap_int_thread_pool_setkey_x
+#define        ldap_pvt_thread_pool_setkey     ldap_int_thread_pool_setkey
 #define        ldap_pvt_thread_pool_purgekey   ldap_int_thread_pool_purgekey
 #define        ldap_pvt_thread_pool_context    ldap_int_thread_pool_context
 #define        ldap_pvt_thread_pool_context_reset ldap_int_thread_pool_context_reset
@@ -182,7 +182,7 @@
 #undef ldap_pvt_thread_pool_resume
 #undef ldap_pvt_thread_pool_destroy
 #undef ldap_pvt_thread_pool_getkey
-#undef ldap_pvt_thread_pool_setkey_x
+#undef ldap_pvt_thread_pool_setkey
 #undef ldap_pvt_thread_pool_purgekey
 #undef ldap_pvt_thread_pool_context
 #undef ldap_pvt_thread_pool_context_reset