From d652cec246bd394efd039c6625688bbf4385f32c Mon Sep 17 00:00:00 2001 From: Jani Taskinen Date: Mon, 2 Jun 2008 11:23:16 +0000 Subject: [PATCH] =?utf8?q?-=20Revert=20pointless=20patch:=20a)=20the=20ver?= =?utf8?q?sion=20is=20already=20there,=20see=20line=20above,=20b)=20one=20?= =?utf8?q?branch=20commits=20are=20idiotic=20to=20begin=20with,=20we=20hav?= =?utf8?q?e=20three=20active=20branches!=20This=20only=20leads=20to=20out-?= =?utf8?q?of-sync=20situations=20=C3=83=C2=A1la=20PDO..?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- ext/ldap/ldap.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/ext/ldap/ldap.c b/ext/ldap/ldap.c index a5f6760f60..66d2a33584 100644 --- a/ext/ldap/ldap.c +++ b/ext/ldap/ldap.c @@ -49,9 +49,7 @@ #if HAVE_NSLDAP #include #endif -#ifndef strdup #define strdup _strdup -#endif #undef WINDOWS #undef strcasecmp #undef strncasecmp @@ -256,14 +254,10 @@ PHP_MINFO_FUNCTION(ldap) #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 -- 2.50.1