diff options
author | Anatol Belski <ab@php.net> | 2017-10-30 18:16:03 +0100 |
---|---|---|
committer | Anatol Belski <ab@php.net> | 2017-10-30 18:16:03 +0100 |
commit | 6eb4daabeb69cc426fe2c19c473acb35af05502a (patch) | |
tree | 444f78cb2b8fa74f4642b500ae36f6fe2cbfce8e | |
parent | 7c2031bfca3a4c006fbdbd863373dcebc360c7cd (diff) | |
parent | 68c500421cc1833dfc366f9ff287dd995217dc88 (diff) | |
download | php-git-6eb4daabeb69cc426fe2c19c473acb35af05502a.tar.gz |
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Add missing ICU version check
-rw-r--r-- | ext/intl/spoofchecker/spoofchecker_class.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/ext/intl/spoofchecker/spoofchecker_class.h b/ext/intl/spoofchecker/spoofchecker_class.h index d6f2c2d543..c0cb0c5327 100644 --- a/ext/intl/spoofchecker/spoofchecker_class.h +++ b/ext/intl/spoofchecker/spoofchecker_class.h @@ -78,6 +78,8 @@ extern zend_class_entry *Spoofchecker_ce_ptr; RETURN_FALSE; \ } \ +#if U_ICU_VERSION_MAJOR_NUM >= 58 #define SPOOFCHECKER_DEFAULT_RESTRICTION_LEVEL USPOOF_HIGHLY_RESTRICTIVE +#endif #endif // #ifndef SPOOFCHECKER_CLASS_H |