diff options
| author | Côme Bernigaud <mcmic@php.net> | 2015-06-30 09:31:19 +0200 |
|---|---|---|
| committer | Côme Bernigaud <mcmic@php.net> | 2015-06-30 09:31:19 +0200 |
| commit | d554d64f649a915b4ecb3a1de409cfc8ff0e9133 (patch) | |
| tree | ead9ce8a17b3051593f02bab07a62323eabed58c /ext | |
| parent | f7565a93d84f1ea6723e9d2aeb0e881f46925c84 (diff) | |
| parent | 57525d01dc29804903f03e471cf117e077d86ca4 (diff) | |
| download | php-git-d554d64f649a915b4ecb3a1de409cfc8ff0e9133.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
keep LDAP_DEPRECATED in config.w32
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/ldap/config.w32 | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/ext/ldap/config.w32 b/ext/ldap/config.w32 index aa3491fe67..2fa05f4383 100644 --- a/ext/ldap/config.w32 +++ b/ext/ldap/config.w32 @@ -21,6 +21,7 @@ if (PHP_LDAP != "no") { AC_DEFINE('HAVE_LDAP', 1); AC_DEFINE('HAVE_LDAP_SASL', 1); AC_DEFINE('HAVE_LDAP_SASL_SASL_H', 1); + AC_DEFINE('LDAP_DEPRECATED', 1); } else { WARNING("ldap not enabled; libraries and headers not found"); |