]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.4'
authorNikita Popov <nikita.ppv@gmail.com>
Tue, 11 Jun 2019 15:12:33 +0000 (17:12 +0200)
committerNikita Popov <nikita.ppv@gmail.com>
Tue, 11 Jun 2019 15:12:33 +0000 (17:12 +0200)
1  2 
ext/gmp/gmp.c
ext/ldap/config.m4
ext/ldap/config.w32
ext/ldap/ldap.c

diff --cc ext/gmp/gmp.c
Simple merge
Simple merge
index 59aff718bfd9f258f13a05824912c08bac6efc35,b947aa5177ca3ec63ccbd9d3b4e6095094fdbed5..1cbbfb8ba836c26a698f09b306d079c756d74835
@@@ -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);
diff --cc ext/ldap/ldap.c
Simple merge