From f0d775609b40062c2b5e01c1d0d40f053652a499 Mon Sep 17 00:00:00 2001 From: Hallvard Furuseth Date: Wed, 19 Aug 2009 10:10:31 +0000 Subject: [PATCH] More ITS#6262: Also define ldap_pvt_gmtime_[un]lock if localtime_r is missing --- include/ldap_pvt.h | 19 +++++++++++-------- libraries/libldap/util-int.c | 4 +++- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/include/ldap_pvt.h b/include/ldap_pvt.h index 28a927f115..85c0345b48 100644 --- 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 d07ce1865e..d19f2b8069 100644 --- 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 ) { -- 2.39.5