mirror of
https://git.openldap.org/openldap/openldap.git
synced 2025-02-23 14:09:39 +08:00
Remaining LDAP_COMPILING_R should be LDAP_R_COMPILE.
This commit is contained in:
parent
84bafea62e
commit
9cc9a84527
@ -12,7 +12,7 @@
|
|||||||
#ifndef _LDAP_INT_H
|
#ifndef _LDAP_INT_H
|
||||||
#define _LDAP_INT_H 1
|
#define _LDAP_INT_H 1
|
||||||
|
|
||||||
#ifdef LDAP_COMPILING_R
|
#ifdef LDAP_R_COMPILE
|
||||||
#define LDAP_THREAD_SAFE 1
|
#define LDAP_THREAD_SAFE 1
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -41,7 +41,7 @@
|
|||||||
# define USE_CTIME_R
|
# define USE_CTIME_R
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef LDAP_COMPILING_R
|
#ifdef LDAP_R_COMPILE
|
||||||
# ifndef USE_CTIME_R
|
# ifndef USE_CTIME_R
|
||||||
static ldap_pvt_thread_mutex_t ldap_int_ctime_mutex;
|
static ldap_pvt_thread_mutex_t ldap_int_ctime_mutex;
|
||||||
# endif
|
# endif
|
||||||
@ -65,11 +65,11 @@ char *ldap_pvt_ctime( const time_t *tp, char *buf )
|
|||||||
# endif
|
# endif
|
||||||
|
|
||||||
#else
|
#else
|
||||||
# ifdef LDAP_COMPILNG_R
|
# ifdef LDAP_R_COMPILE
|
||||||
ldap_pvt_thread_mutex_lock( &ldap_int_ctime_mutex );
|
ldap_pvt_thread_mutex_lock( &ldap_int_ctime_mutex );
|
||||||
# endif
|
# endif
|
||||||
memcpy( buf, ctime(tp), 26 );
|
memcpy( buf, ctime(tp), 26 );
|
||||||
# ifdef LDAP_COMPILNG_R
|
# ifdef LDAP_R_COMPILE
|
||||||
ldap_pvt_thread_mutex_unlock( &ldap_int_ctime_mutex );
|
ldap_pvt_thread_mutex_unlock( &ldap_int_ctime_mutex );
|
||||||
# endif
|
# endif
|
||||||
return buf;
|
return buf;
|
||||||
@ -111,7 +111,7 @@ int ldap_pvt_gethostbyname_a(
|
|||||||
return r;
|
return r;
|
||||||
}
|
}
|
||||||
return -1;
|
return -1;
|
||||||
#elif defined( LDAP_COMPILING_R )
|
#elif defined( LDAP_R_COMPILE )
|
||||||
# define NEED_COPY_HOSTENT
|
# define NEED_COPY_HOSTENT
|
||||||
struct hostent *he;
|
struct hostent *he;
|
||||||
int retval;
|
int retval;
|
||||||
@ -180,7 +180,7 @@ int ldap_pvt_gethostbyaddr_a(
|
|||||||
return r;
|
return r;
|
||||||
}
|
}
|
||||||
return -1;
|
return -1;
|
||||||
#elif defined( LDAP_COMPILING_R )
|
#elif defined( LDAP_R_COMPILE )
|
||||||
# undef NEED_COPY_HOSTENT
|
# undef NEED_COPY_HOSTENT
|
||||||
# define NEED_COPY_HOSTENT
|
# define NEED_COPY_HOSTENT
|
||||||
struct hostent *he;
|
struct hostent *he;
|
||||||
@ -224,18 +224,18 @@ void ldap_pvt_init_utils( void )
|
|||||||
return;
|
return;
|
||||||
done=1;
|
done=1;
|
||||||
|
|
||||||
#ifdef LDAP_COMPILING_R
|
#ifdef LDAP_R_COMPILE
|
||||||
|
|
||||||
#if !defined( USE_CTIME_R ) && !defined( HAVE_REENTRANT_FUNCTIONS )
|
#if !defined( USE_CTIME_R ) && !defined( HAVE_REENTRANT_FUNCTIONS )
|
||||||
ldap_pvt_thread_mutex_init( &ldap_int_ctime_mutex, NULL );
|
ldap_pvt_thread_mutex_init( &ldap_int_ctime_mutex );
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if !defined( HAVE_GETHOSTBYNAME_R )
|
#if !defined( HAVE_GETHOSTBYNAME_R )
|
||||||
ldap_pvt_thread_mutex_init( &ldap_int_gethostbyname_mutex, NULL );
|
ldap_pvt_thread_mutex_init( &ldap_int_gethostbyname_mutex );
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if !defined( HAVE_GETHOSTBYADDR_R )
|
#if !defined( HAVE_GETHOSTBYADDR_R )
|
||||||
ldap_pvt_thread_mutex_init( &ldap_int_gethostbyaddr_mutex, NULL );
|
ldap_pvt_thread_mutex_init( &ldap_int_gethostbyaddr_mutex );
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* call other module init functions here... */
|
/* call other module init functions here... */
|
||||||
|
Loading…
Reference in New Issue
Block a user