From: Nikita Popov <nikita.ppv@gmail.com>
Date: Tue, 11 Jun 2019 15:12:33 +0000 (+0200)
Subject: Merge branch 'PHP-7.4'
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=466666c616793162d89125e2588f898210b836f6;p=php

Merge branch 'PHP-7.4'
---

466666c616793162d89125e2588f898210b836f6
diff --cc ext/ldap/config.w32
index 59aff718bf,b947aa5177..1cbbfb8ba8
--- a/ext/ldap/config.w32
+++ b/ext/ldap/config.w32
@@@ -17,7 -17,7 +17,6 @@@ if (PHP_LDAP != "no") 
  		AC_DEFINE('HAVE_LDAP_START_TLS_S', 1);
  		AC_DEFINE('HAVE_LDAP', 1);
  		AC_DEFINE('HAVE_LDAP_SASL', 1);
- 		AC_DEFINE('HAVE_LDAP_SASL_SASL_H', 1);
 -		AC_DEFINE('LDAP_DEPRECATED', 1);
  		AC_DEFINE('HAVE_LDAP_CONTROL_FIND', 1);
  		AC_DEFINE('HAVE_LDAP_PARSE_EXTENDED_RESULT', 1);
  		AC_DEFINE('HAVE_LDAP_EXTENDED_OPERATION_S', 1);