More ITS#6262: Also define ldap_pvt_gmtime_[un]lock if localtime_r is missing

diff --git a/include/ldap_pvt.h b/include/ldap_pvt.h
index 28a927f115c65bf0538d743ec4f144bc07c868d4..85c0345b4873cd91e63184320b4a68a8009e3214 100644 (file)
--- a/include/ldap_pvt.h
+++ b/include/ldap_pvt.h
@@ -93,16 +93,8 @@ ldap_pvt_ctime LDAP_P((
 
 # if defined( HAVE_GMTIME_R )
 #   define USE_GMTIME_R
-#   define ldap_pvt_gmtime_lock() (0)
-#   define ldap_pvt_gmtime_unlock() (0)
 #   define ldap_pvt_gmtime(timep, result) gmtime_r((timep), (result))
 # else
-LDAP_F( int )
-ldap_pvt_gmtime_lock LDAP_P(( void ));
-
-LDAP_F( int )
-ldap_pvt_gmtime_unlock LDAP_P(( void ));
-
 LDAP_F( struct tm * )
 ldap_pvt_gmtime LDAP_P((
        LDAP_CONST time_t *timep,
@@ -119,6 +111,17 @@ ldap_pvt_localtime LDAP_P((
        struct tm *result ));
 # endif
 
+#if defined( USE_GMTIME_R ) && defined( USE_LOCALTIME_R )
+#   define ldap_pvt_gmtime_lock() (0)
+#   define ldap_pvt_gmtime_unlock() (0)
+#else
+LDAP_F( int )
+ldap_pvt_gmtime_lock LDAP_P(( void ));
+
+LDAP_F( int )
+ldap_pvt_gmtime_unlock LDAP_P(( void ));
+#endif /* USE_GMTIME_R && USE_LOCALTIME_R */
+
 /* Get current time as a structured time */
 struct lutil_tm;
 LDAP_F( void )

diff --git a/libraries/libldap/util-int.c b/libraries/libldap/util-int.c
index d07ce1865e3054155fc88afc98c1d8e8ad6aea65..d19f2b80695df047b1ec73765ba36a50275af33c 100644 (file)
--- a/libraries/libldap/util-int.c
+++ b/libraries/libldap/util-int.c
@@ -116,7 +116,7 @@ char *ldap_pvt_ctime( const time_t *tp, char *buf )
 #endif 
 }
 
-#ifndef USE_GMTIME_R
+#if !defined( USE_GMTIME_R ) || !defined( USE_LOCALTIME_R )
 int
 ldap_pvt_gmtime_lock( void )
 {
@@ -136,7 +136,9 @@ ldap_pvt_gmtime_unlock( void )
        return ldap_pvt_thread_mutex_unlock( &ldap_int_gmtime_mutex );
 # endif /* LDAP_R_COMPILE */
 }
+#endif /* !USE_GMTIME_R || !USE_LOCALTIME_R */
 
+#ifndef USE_GMTIME_R
 struct tm *
 ldap_pvt_gmtime( const time_t *timep, struct tm *result )
 {