jani            Mon Jun  2 08:46:41 2008 UTC

  Modified files:              (Branch: PHP_5_3)
    /php-src/ext/ldap   ldap.c 
  Log:
  - Revert crap
  # Someone should remove Pierre's karma too..
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/ldap/ldap.c?r1=1.161.2.3.2.11.2.10&r2=1.161.2.3.2.11.2.11&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.10 
php-src/ext/ldap/ldap.c:1.161.2.3.2.11.2.11
--- php-src/ext/ldap/ldap.c:1.161.2.3.2.11.2.10 Mon Jun  2 06:48:35 2008
+++ php-src/ext/ldap/ldap.c     Mon Jun  2 08:46:41 2008
@@ -23,7 +23,7 @@
    +----------------------------------------------------------------------+
  */
  
-/* $Id: ldap.c,v 1.161.2.3.2.11.2.10 2008/06/02 06:48:35 pajoye Exp $ */
+/* $Id: ldap.c,v 1.161.2.3.2.11.2.11 2008/06/02 08:46:41 jani Exp $ */
 #define IS_EXT_MODULE
 
 #ifdef HAVE_CONFIG_H
@@ -38,6 +38,7 @@
 
 #include "php.h"
 #include "php_ini.h"
+
 #include <stddef.h>
 
 #include "ext/standard/dl.h"
@@ -48,9 +49,7 @@
 #if HAVE_NSLDAP
 #include <winsock2.h>
 #endif
-#ifndef strdup
-#  define strdup _strdup
-#endif
+#define strdup _strdup
 #undef WINDOWS
 #undef strcasecmp
 #undef strncasecmp
@@ -238,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.10 2008/06/02 06:48:35 pajoye Exp $");
+       php_info_print_table_row(2, "RCS Version", "$Id: ldap.c,v 
1.161.2.3.2.11.2.11 2008/06/02 08:46:41 jani Exp $");
 
        if (LDAPG(max_links) == -1) {
                snprintf(tmp, 31, "%ld/unlimited", LDAPG(num_links));
@@ -247,13 +246,6 @@
        }
        php_info_print_table_row(2, "Total Links", tmp);
 
-       
-#ifdef LDAP_VENDOR_VERSION_MAJOR
-       snprintf(tmp, 31, "%d.%d.%d", LDAP_VENDOR_VERSION_MAJOR, 
-                               LDAP_VENDOR_VERSION_MINOR, 
LDAP_VENDOR_VERSION_PATCH);
-       php_info_print_table_row(2, "Version", tmp);
-#endif
-
 #ifdef LDAP_API_VERSION
        snprintf(tmp, 31, "%d", LDAP_API_VERSION);
        php_info_print_table_row(2, "API Version", tmp);



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to