Merge remote branch 'origin/mdb.master'

[openldap] / libraries / libldap / util-int.c

diff --git a/libraries/libldap/util-int.c b/libraries/libldap/util-int.c
index b246c3358923159fb3a5420e043169e7d3f3320c..85f13fcedd72d874bf11f798e329bd8b2b1d1aee 100644 (file)
--- a/libraries/libldap/util-int.c
+++ b/libraries/libldap/util-int.c
@@ -1,7 +1,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2010 The OpenLDAP Foundation.
+ * Copyright 1998-2012 The OpenLDAP Foundation.
  * Portions Copyright 1998 A. Hartgers.
  * All rights reserved.
  *
@@ -122,7 +122,7 @@ ldap_pvt_gmtime_lock( void )
 # ifndef LDAP_R_COMPILE
        return 0;
 # else /* LDAP_R_COMPILE */
-       return LDAP_MUTEX_LOCK( &ldap_int_gmtime_mutex );
+       return ldap_pvt_thread_mutex_lock( &ldap_int_gmtime_mutex );
 # endif /* LDAP_R_COMPILE */
 }
 
@@ -132,7 +132,7 @@ ldap_pvt_gmtime_unlock( void )
 # ifndef LDAP_R_COMPILE
        return 0;
 # else /* LDAP_R_COMPILE */
-       return LDAP_MUTEX_UNLOCK( &ldap_int_gmtime_mutex );
+       return ldap_pvt_thread_mutex_unlock( &ldap_int_gmtime_mutex );
 # endif /* LDAP_R_COMPILE */
 }
 #endif /* !USE_GMTIME_R || !USE_LOCALTIME_R */