[PHP-DEV] CVS update: php31/ext/ldap From: shane (php-dev <email protected>)
Date: 10/29/98

Date: Thursday October 29, 1998 @ 1:04
Author: shane

Update of /repository/php31/ext/ldap
In directory asf:/u2/tmp/cvs-serv26904/ext/ldap

Modified Files:
        ldap.c
Log Message:
various patches. including odbc mega patch.

Index: php31/ext/ldap/ldap.c
diff -c php31/ext/ldap/ldap.c:2.11 php31/ext/ldap/ldap.c:2.12
*** php31/ext/ldap/ldap.c:2.11 Sat Oct 17 17:19:11 1998
--- php31/ext/ldap/ldap.c Thu Oct 29 01:04:27 1998
***************
*** 29,35 ****
   */
   
  
! /* $Id: ldap.c,v 2.11 1998/10/17 21:19:11 shane Exp $ */
  #define IS_EXT_MODULE
  #if !PHP_31 && defined(THREAD_SAFE)
  #undef THREAD_SAFE
--- 29,35 ----
   */
   
  
! /* $Id: ldap.c,v 2.12 1998/10/29 06:04:27 shane Exp $ */
  #define IS_EXT_MODULE
  #if !PHP_31 && defined(THREAD_SAFE)
  #undef THREAD_SAFE
***************
*** 52,58 ****
  #if COMPILE_DL
  #if PHP_31
  #include "ext/phpdl.h"
! #include "ext/standard/dl.h"
  #else
  #include "dl/phpdl.h"
  #include "functions/dl.h"
--- 52,58 ----
  #if COMPILE_DL
  #if PHP_31
  #include "ext/phpdl.h"
! #include "dl.h"
  #else
  #include "dl/phpdl.h"
  #include "functions/dl.h"
***************
*** 84,90 ****
  #if THREAD_SAFE & HAVE_NSLDAP
  #include "php3_threads.h"
  /* Structure for LDAP error values */
! #define LDAP_TLS_VARS ldap_module *PHP3_TLS_GET(ldapTLS,php3_ldap_module)
  #define LDAP_GLOBAL(a) php3_ldap_module->a
  #else
  #define LDAP_TLS_VARS
--- 84,90 ----
  #if THREAD_SAFE & HAVE_NSLDAP
  #include "php3_threads.h"
  /* Structure for LDAP error values */
! #define LDAP_TLS_VARS ldap_module *php3_ldap_module=TlsGetValue(ldapTLS)
  #define LDAP_GLOBAL(a) php3_ldap_module->a
  #else
  #define LDAP_TLS_VARS
***************
*** 289,297 ****
          char maxl[16];
  #if HAVE_NSLDAP
          LDAPVersion ver;
! double SDKVersion;
! /* Print version information */
! SDKVersion = ldap_version( &ver );
  #endif
          LDAP_TLS_VARS;
  
--- 289,295 ----
          char maxl[16];
  #if HAVE_NSLDAP
          LDAPVersion ver;
! double SDKVersion = ldap_version( &ver );
  #endif
          LDAP_TLS_VARS;
  
***************
*** 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.11 1998/10/17 21:19:11 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>"
--- 302,308 ----
  
          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.12 1998/10/29 06:04:27 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>" 

--
PHP Development Mailing List   http://www.php.net/
To unsubscribe send an empty message to php-dev-unsubscribe <email protected>
For help: php-dev-help <email protected>