From 271f91169e366df1ddc6d6a55984a9baa569f888 Mon Sep 17 00:00:00 2001
From: Peter Kokot <peterkokot@gmail.com>
Date: Fri, 7 Jun 2024 23:27:22 +0200
Subject: [PATCH] Remove WINDOWS symbol from ext/ldap/ldap.c (#14468)

The WINDOWS symbol was used up to commit
f79688e8489145e67f6f76ca7cd0c3dbbe652a54 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.
---
 ext/ldap/ldap.c | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/ext/ldap/ldap.c b/ext/ldap/ldap.c
index 01d40b06a27..f7c405f4835 100644
--- a/ext/ldap/ldap.c
+++ b/ext/ldap/ldap.c
@@ -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 {