CVS update: php31/ext/ldap

Date: Sunday August 30, 1998 @ 15:27 Author: shane Update of /repository/php31/ext/ldap In directory asf:/u2/tmp/cvs-serv26438/ext/ldap Modified Files: ldap.c php3_ldap.h Log Message: Zlib compiles now. Index: php31/ext/ldap/ldap.c diff -c php31/ext/ldap/ldap.c:2.4 php31/ext/ldap/ldap.c:2.5 *** php31/ext/ldap/ldap.c:2.4 Fri Aug 28 00:09:35 1998 --- php31/ext/ldap/ldap.c Sun Aug 30 15:27:38 1998 *************** *** 29,36 **** */ ! /* $Id: ldap.c,v 2.4 1998/08/28 04:09:35 shane Exp $ */ #define IS_EXT_MODULE #ifdef THREAD_SAFE #include "tls.h" DWORD ldapTLS; --- 29,39 ---- */ ! /* $Id: ldap.c,v 2.5 1998/08/30 19:27:38 shane Exp $ */ #define IS_EXT_MODULE + #if !PHP_31 && defined(THREAD_SAFE) + #undef THREAD_SAFE + #endif #ifdef THREAD_SAFE #include "tls.h" DWORD ldapTLS; *************** *** 267,274 **** } int php3_mshutdown_ldap(void){ - LDAP_TLS_VARS; #ifdef THREAD_SAFE PHP3_TLS_THREAD_FREE(php3_ldap_module); PHP3_MUTEX_LOCK(ldap_mutex); numthreads--; --- 270,277 ---- } int php3_mshutdown_ldap(void){ #ifdef THREAD_SAFE + LDAP_TLS_VARS; PHP3_TLS_THREAD_FREE(php3_ldap_module); PHP3_MUTEX_LOCK(ldap_mutex); numthreads--; *************** *** 284,296 **** void php3_info_ldap(void) { char maxl[16]; - LDAP_TLS_VARS; #if HAVE_NSLDAP LDAPVersion ver; double SDKVersion; /* Print version information */ SDKVersion = ldap_version( &ver ); #endif if (LDAP_GLOBAL(max_links) == -1) { strcpy(maxl, "Unlimited"); --- 287,299 ---- void php3_info_ldap(void) { char maxl[16]; #if HAVE_NSLDAP LDAPVersion ver; double SDKVersion; /* Print version information */ SDKVersion = ldap_version( &ver ); #endif + LDAP_TLS_VARS; if (LDAP_GLOBAL(max_links) == -1) { strcpy(maxl, "Unlimited"); *************** *** 301,307 **** php3_printf("<table>" "<tr><td>Total links:</td><td>%d/%s</td></tr>\n" ! "<tr><td>RCS Version:</td><td>$Id: ldap.c,v 2.4 1998/08/28 04:09:35 shane Exp $</td></tr>\n" #if HAVE_NSLDAP "<tr><td>SDK Version:</td><td>%f</td></tr>" "<tr><td>Highest LDAP Protocol Supported:</td><td>%f</td></tr>" --- 304,310 ---- php3_printf("<table>" "<tr><td>Total links:</td><td>%d/%s</td></tr>\n" ! "<tr><td>RCS Version:</td><td>$Id: ldap.c,v 2.5 1998/08/30 19:27:38 shane Exp $</td></tr>\n" #if HAVE_NSLDAP "<tr><td>SDK Version:</td><td>%f</td></tr>" "<tr><td>Highest LDAP Protocol Supported:</td><td>%f</td></tr>" Index: php31/ext/ldap/php3_ldap.h diff -c php31/ext/ldap/php3_ldap.h:2.2 php31/ext/ldap/php3_ldap.h:2.3 *** php31/ext/ldap/php3_ldap.h:2.2 Thu Aug 27 16:55:41 1998 --- php31/ext/ldap/php3_ldap.h Sun Aug 30 15:27:39 1998 *************** *** 29,35 **** */ ! /* $Id: php3_ldap.h,v 2.2 1998/08/27 20:55:41 shane Exp $ */ #ifndef _PHP3_LDAP_H #define _PHP3_LDAP_H --- 29,35 ---- */ ! /* $Id: php3_ldap.h,v 2.3 1998/08/30 19:27:39 shane Exp $ */ #ifndef _PHP3_LDAP_H #define _PHP3_LDAP_H -- PHP Development Mailing List http://www.php.net/ To unsubscribe send an empty message to php-dev-unsubscribe@lists.php.net For help: php-dev-help@lists.php.net