cvs: php-src(PHP_5_3) /ext/ldap ldap.c

jani Mon Jun 2 11:23:16 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/ldap ldap.c Log: - Revert pointless patch: a) the version is already there, see line above, b) one branch commits are idiotic to begin with, we have three active branches! This only leads to out-of-sync situations ála PDO.. http://cvs.php.net/viewvc.cgi/php-src/ext/ldap/ldap.c?r1=1.161.2.3.2.11.2.12&r2=1.161.2.3.2.11.2.13&diff_format=u Index: php-src/ext/ldap/ldap.c diff -u php-src/ext/ldap/ldap.c:1.161.2.3.2.11.2.12 php-src/ext/ldap/ldap.c:1.161.2.3.2.11.2.13 --- php-src/ext/ldap/ldap.c:1.161.2.3.2.11.2.12 Mon Jun 2 10:25:54 2008 +++ php-src/ext/ldap/ldap.c Mon Jun 2 11:23:16 2008 @@ -23,7 +23,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: ldap.c,v 1.161.2.3.2.11.2.12 2008/06/02 10:25:54 pajoye Exp $ */ +/* $Id: ldap.c,v 1.161.2.3.2.11.2.13 2008/06/02 11:23:16 jani Exp $ */ #define IS_EXT_MODULE #ifdef HAVE_CONFIG_H @@ -49,9 +49,7 @@ #if HAVE_NSLDAP #include <winsock2.h> #endif -#ifndef strdup #define strdup _strdup -#endif #undef WINDOWS #undef strcasecmp #undef strncasecmp @@ -239,7 +237,7 @@ php_info_print_table_start(); php_info_print_table_row(2, "LDAP Support", "enabled"); - php_info_print_table_row(2, "RCS Version", "$Id: ldap.c,v 1.161.2.3.2.11.2.12 2008/06/02 10:25:54 pajoye Exp $"); + php_info_print_table_row(2, "RCS Version", "$Id: ldap.c,v 1.161.2.3.2.11.2.13 2008/06/02 11:23:16 jani Exp $"); if (LDAPG(max_links) == -1) { snprintf(tmp, 31, "%ld/unlimited", LDAPG(num_links)); @@ -256,14 +254,10 @@ #ifdef LDAP_VENDOR_NAME php_info_print_table_row(2, "Vendor Name", LDAP_VENDOR_NAME); #endif - + #ifdef LDAP_VENDOR_VERSION snprintf(tmp, 31, "%d", LDAP_VENDOR_VERSION); php_info_print_table_row(2, "Vendor Version", tmp); - - snprintf(tmp, 31, "%d.%d.%d", LDAP_VENDOR_VERSION_MAJOR, - LDAP_VENDOR_VERSION_MINOR, LDAP_VENDOR_VERSION_PATCH); - php_info_print_table_row(2, "Vendor Version String", tmp); #endif #if HAVE_NSLDAP