- reintroduce the x.y.z version string info (a bit nicer to make the other guy happier)

- silent warning (windows only and don't remove it, thanks)

diff --git a/ext/ldap/ldap.c b/ext/ldap/ldap.c
index 66d2a33584e38c1d0f0f4ed04663f07eb0ba8dfd..a5f6760f6027c338c4a09ebe91fc7a0b8184f090 100644 (file)
--- a/ext/ldap/ldap.c
+++ b/ext/ldap/ldap.c
@@ -49,7 +49,9 @@
 #if HAVE_NSLDAP
 #include <winsock2.h>
 #endif
+#ifndef strdup
 #define strdup _strdup
+#endif
 #undef WINDOWS
 #undef strcasecmp
 #undef strncasecmp
@@ -254,10 +256,14 @@ 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