php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove WINDOWS symbol from ext/ldap/ldap.c (#14468)

Browse Source 
The WINDOWS symbol was used up to commit
f79688e848 where it got undefined when
condition `#if WIN32|WINNT` was met. Then the condition was replaced
with simpler PHP_WIN32 (which today implies also 64-bit platforms) and
WINDOWS is undefined in this file when targeting Windows platform.
Conditions otherwise also work on Windows anyway because of the
LDAP_API_VERSION check.
This commit is contained in:
Peter Kokot
2024-06-07 23:27:22 +02:00
committed by GitHub
parent 9f63836cf4
commit 271f91169e
1 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
ext/ldap/ldap.c
View File

@@ -38,7 +38,6 @@
#ifdef PHP_WIN32
#include <string.h>
#include "config.w32.h"
#undef WINDOWS
#undef strcasecmp
#undef strncasecmp
#define WINSOCK 1
@@ -1892,12 +1891,12 @@ PHP_FUNCTION(ldap_get_entries)
add_index_string(&tmp1, num_attrib, attribute);
num_attrib++;
#if (LDAP_API_VERSION > 2000) || defined(HAVE_ORALDAP) || WINDOWS
#if (LDAP_API_VERSION > 2000) || defined(HAVE_ORALDAP)
ldap_memfree(attribute);
#endif
attribute = ldap_next_attribute(ldap, ldap_result_entry, ber);
}
#if (LDAP_API_VERSION > 2000) || defined(HAVE_ORALDAP) || WINDOWS
#if (LDAP_API_VERSION > 2000) || defined(HAVE_ORALDAP)
if (ber != NULL) {
ber_free(ber, 0);
}
@@ -1910,7 +1909,7 @@ PHP_FUNCTION(ldap_get_entries)
} else {
add_assoc_null(&tmp1, "dn");
}
#if (LDAP_API_VERSION > 2000) || defined(HAVE_ORALDAP) || WINDOWS
#if (LDAP_API_VERSION > 2000) || defined(HAVE_ORALDAP)
ldap_memfree(dn);
#else
free(dn);
@@ -1948,7 +1947,7 @@ PHP_FUNCTION(ldap_first_attribute)
RETURN_FALSE;
} else {
RETVAL_STRING(attribute);
#if (LDAP_API_VERSION > 2000) || defined(HAVE_ORALDAP) || WINDOWS
#if (LDAP_API_VERSION > 2000) || defined(HAVE_ORALDAP)
ldap_memfree(attribute);
#endif
}
@@ -1978,7 +1977,7 @@ PHP_FUNCTION(ldap_next_attribute)
}
if ((attribute = ldap_next_attribute(ld->link, resultentry->data, resultentry->ber)) == NULL) {
#if (LDAP_API_VERSION > 2000) || defined(HAVE_ORALDAP) || WINDOWS
#if (LDAP_API_VERSION > 2000) || defined(HAVE_ORALDAP)
if (resultentry->ber != NULL) {
ber_free(resultentry->ber, 0);
resultentry->ber = NULL;
@@ -1987,7 +1986,7 @@ PHP_FUNCTION(ldap_next_attribute)
RETURN_FALSE;
} else {
RETVAL_STRING(attribute);
#if (LDAP_API_VERSION > 2000) || defined(HAVE_ORALDAP) || WINDOWS
#if (LDAP_API_VERSION > 2000) || defined(HAVE_ORALDAP)
ldap_memfree(attribute);
#endif
}
@@ -2034,12 +2033,12 @@ PHP_FUNCTION(ldap_get_attributes)
add_index_string(return_value, num_attrib, attribute);
num_attrib++;
#if (LDAP_API_VERSION > 2000) || defined(HAVE_ORALDAP) || WINDOWS
#if (LDAP_API_VERSION > 2000) || defined(HAVE_ORALDAP)
ldap_memfree(attribute);
#endif
attribute = ldap_next_attribute(ld->link, resultentry->data, ber);
}
#if (LDAP_API_VERSION > 2000) || defined(HAVE_ORALDAP) || WINDOWS
#if (LDAP_API_VERSION > 2000) || defined(HAVE_ORALDAP)
if (ber != NULL) {
ber_free(ber, 0);
}
@@ -2107,7 +2106,7 @@ PHP_FUNCTION(ldap_get_dn)
text = ldap_get_dn(ld->link, resultentry->data);
if (text != NULL) {
RETVAL_STRING(text);
#if (LDAP_API_VERSION > 2000) || defined(HAVE_ORALDAP) || WINDOWS
#if (LDAP_API_VERSION > 2000) || defined(HAVE_ORALDAP)
ldap_memfree(text);
#else
free(text);
@@ -2164,7 +2163,7 @@ PHP_FUNCTION(ldap_dn2ufn)
if (ufn != NULL) {
RETVAL_STRING(ufn);
#if (LDAP_API_VERSION > 2000) || defined(HAVE_ORALDAP) || WINDOWS
#if (LDAP_API_VERSION > 2000) || defined(HAVE_ORALDAP)
ldap_memfree(ufn);
#endif
} else {