Merge branch 'PHP-7.0'

* PHP-7.0:
  fix compat for ICU < 50
This commit is contained in:
Anatol Belski 2016-04-08 12:49:51 +02:00
commit 91da256bb1

View File

@ -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) || \