diff options
| author | Anatol Belski <ab@php.net> | 2016-04-08 12:49:51 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2016-04-08 12:49:51 +0200 |
| commit | 91da256bb13ebaff677042d992f1403f6783ebed (patch) | |
| tree | 2c8a3a2f9cf68d9b9ece47b403fa3b5b43c159ad | |
| parent | de2da3bf02b63c2220b485a3aaa3cfdcb2871d70 (diff) | |
| parent | 45d9efaac3ff4f861f86093d801aefd1b4fde9e5 (diff) | |
| download | php-git-91da256bb13ebaff677042d992f1403f6783ebed.tar.gz | |
Merge branch 'PHP-7.0'
* PHP-7.0:
fix compat for ICU < 50
| -rw-r--r-- | ext/intl/dateformat/dateformat_create.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/ext/intl/dateformat/dateformat_create.cpp b/ext/intl/dateformat/dateformat_create.cpp index 8705d4bc0b..0e73fda01c 100644 --- a/ext/intl/dateformat/dateformat_create.cpp +++ b/ext/intl/dateformat/dateformat_create.cpp @@ -36,6 +36,10 @@ extern "C" { #include "dateformat_helpers.h" #include "zend_exceptions.h" +#if U_ICU_VERSION_MINOR_NUM < 50 +#define UDAT_PATTERN 0 +#endif + #define INTL_UDATE_FMT_OK(i) \ (UDAT_FULL == (i) || UDAT_LONG == (i) || \ UDAT_MEDIUM == (i) || UDAT_SHORT == (i) || \ |