From bf5cb890b05504fc4299ec154c00c483130f0602 Mon Sep 17 00:00:00 2001 From: Zeev Suraski Date: Sat, 26 Feb 2000 03:20:55 +0000 Subject: - Convert 'PHP3' to 'PHP' - Avoid declaring crypt() related salt types twice --- ext/ldap/ldap.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'ext/ldap/ldap.c') diff --git a/ext/ldap/ldap.c b/ext/ldap/ldap.c index a50f1e2e60..55ebad97ff 100644 --- a/ext/ldap/ldap.c +++ b/ext/ldap/ldap.c @@ -175,17 +175,17 @@ PHP_MINIT_FUNCTION(ldap) { #if defined(THREAD_SAFE) ldap_module *php_ldap_module; - PHP3_MUTEX_ALLOC(ldap_mutex); - PHP3_MUTEX_LOCK(ldap_mutex); + PHP_MUTEX_ALLOC(ldap_mutex); + PHP_MUTEX_LOCK(ldap_mutex); numthreads++; if (numthreads==1){ if (!PHP3_TLS_PROC_STARTUP(ldapTLS)){ - PHP3_MUTEX_UNLOCK(ldap_mutex); - PHP3_MUTEX_FREE(ldap_mutex); + PHP_MUTEX_UNLOCK(ldap_mutex); + PHP_MUTEX_FREE(ldap_mutex); return 0; } } - PHP3_MUTEX_UNLOCK(ldap_mutex); + PHP_MUTEX_UNLOCK(ldap_mutex); if(!PHP3_TLS_THREAD_INIT(ldapTLS,php_ldap_module,ldap_module)) return 0; #if 0 /*HAVE_NSLDAP*/ @@ -246,13 +246,13 @@ PHP_MSHUTDOWN_FUNCTION(ldap) #ifdef THREAD_SAFE LDAP_TLS_VARS; PHP3_TLS_THREAD_FREE(php_ldap_module); - PHP3_MUTEX_LOCK(ldap_mutex); + PHP_MUTEX_LOCK(ldap_mutex); numthreads--; if (!numthreads) { PHP3_TLS_PROC_SHUTDOWN(ldapTLS); } - PHP3_MUTEX_UNLOCK(ldap_mutex); - PHP3_MUTEX_FREE(ldap_mutex); + PHP_MUTEX_UNLOCK(ldap_mutex); + PHP_MUTEX_FREE(ldap_mutex); #endif return SUCCESS; } -- cgit v1.2.1