3838#ifdef PHP_WIN32
3939#include <string.h>
4040#include "config.w32.h"
41- #undef WINDOWS
4241#undef strcasecmp
4342#undef strncasecmp
4443#define WINSOCK 1
@@ -1892,12 +1891,12 @@ PHP_FUNCTION(ldap_get_entries)
18921891 add_index_string (& tmp1 , num_attrib , attribute );
18931892
18941893 num_attrib ++ ;
1895- #if (LDAP_API_VERSION > 2000 ) || defined(HAVE_ORALDAP ) || WINDOWS
1894+ #if (LDAP_API_VERSION > 2000 ) || defined(HAVE_ORALDAP )
18961895 ldap_memfree (attribute );
18971896#endif
18981897 attribute = ldap_next_attribute (ldap , ldap_result_entry , ber );
18991898 }
1900- #if (LDAP_API_VERSION > 2000 ) || defined(HAVE_ORALDAP ) || WINDOWS
1899+ #if (LDAP_API_VERSION > 2000 ) || defined(HAVE_ORALDAP )
19011900 if (ber != NULL ) {
19021901 ber_free (ber , 0 );
19031902 }
@@ -1910,7 +1909,7 @@ PHP_FUNCTION(ldap_get_entries)
19101909 } else {
19111910 add_assoc_null (& tmp1 , "dn" );
19121911 }
1913- #if (LDAP_API_VERSION > 2000 ) || defined(HAVE_ORALDAP ) || WINDOWS
1912+ #if (LDAP_API_VERSION > 2000 ) || defined(HAVE_ORALDAP )
19141913 ldap_memfree (dn );
19151914#else
19161915 free (dn );
@@ -1948,7 +1947,7 @@ PHP_FUNCTION(ldap_first_attribute)
19481947 RETURN_FALSE ;
19491948 } else {
19501949 RETVAL_STRING (attribute );
1951- #if (LDAP_API_VERSION > 2000 ) || defined(HAVE_ORALDAP ) || WINDOWS
1950+ #if (LDAP_API_VERSION > 2000 ) || defined(HAVE_ORALDAP )
19521951 ldap_memfree (attribute );
19531952#endif
19541953 }
@@ -1978,7 +1977,7 @@ PHP_FUNCTION(ldap_next_attribute)
19781977 }
19791978
19801979 if ((attribute = ldap_next_attribute (ld -> link , resultentry -> data , resultentry -> ber )) == NULL ) {
1981- #if (LDAP_API_VERSION > 2000 ) || defined(HAVE_ORALDAP ) || WINDOWS
1980+ #if (LDAP_API_VERSION > 2000 ) || defined(HAVE_ORALDAP )
19821981 if (resultentry -> ber != NULL ) {
19831982 ber_free (resultentry -> ber , 0 );
19841983 resultentry -> ber = NULL ;
@@ -1987,7 +1986,7 @@ PHP_FUNCTION(ldap_next_attribute)
19871986 RETURN_FALSE ;
19881987 } else {
19891988 RETVAL_STRING (attribute );
1990- #if (LDAP_API_VERSION > 2000 ) || defined(HAVE_ORALDAP ) || WINDOWS
1989+ #if (LDAP_API_VERSION > 2000 ) || defined(HAVE_ORALDAP )
19911990 ldap_memfree (attribute );
19921991#endif
19931992 }
@@ -2034,12 +2033,12 @@ PHP_FUNCTION(ldap_get_attributes)
20342033 add_index_string (return_value , num_attrib , attribute );
20352034
20362035 num_attrib ++ ;
2037- #if (LDAP_API_VERSION > 2000 ) || defined(HAVE_ORALDAP ) || WINDOWS
2036+ #if (LDAP_API_VERSION > 2000 ) || defined(HAVE_ORALDAP )
20382037 ldap_memfree (attribute );
20392038#endif
20402039 attribute = ldap_next_attribute (ld -> link , resultentry -> data , ber );
20412040 }
2042- #if (LDAP_API_VERSION > 2000 ) || defined(HAVE_ORALDAP ) || WINDOWS
2041+ #if (LDAP_API_VERSION > 2000 ) || defined(HAVE_ORALDAP )
20432042 if (ber != NULL ) {
20442043 ber_free (ber , 0 );
20452044 }
@@ -2107,7 +2106,7 @@ PHP_FUNCTION(ldap_get_dn)
21072106 text = ldap_get_dn (ld -> link , resultentry -> data );
21082107 if (text != NULL ) {
21092108 RETVAL_STRING (text );
2110- #if (LDAP_API_VERSION > 2000 ) || defined(HAVE_ORALDAP ) || WINDOWS
2109+ #if (LDAP_API_VERSION > 2000 ) || defined(HAVE_ORALDAP )
21112110 ldap_memfree (text );
21122111#else
21132112 free (text );
@@ -2164,7 +2163,7 @@ PHP_FUNCTION(ldap_dn2ufn)
21642163
21652164 if (ufn != NULL ) {
21662165 RETVAL_STRING (ufn );
2167- #if (LDAP_API_VERSION > 2000 ) || defined(HAVE_ORALDAP ) || WINDOWS
2166+ #if (LDAP_API_VERSION > 2000 ) || defined(HAVE_ORALDAP )
21682167 ldap_memfree (ufn );
21692168#endif
21702169 } else {
0 commit comments