diff options
| author | Anatol Belski <ab@php.net> | 2019-06-01 02:18:56 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2019-06-01 02:18:56 +0200 |
| commit | ee153deb1fc91cecb2095ada9bd12683ca801852 (patch) | |
| tree | 113b4ec2db56cfda049b34025c665591142fc5e6 | |
| parent | b01d9fdab1c4893fb0793be65292fd20713b40c6 (diff) | |
| download | php-git-ee153deb1fc91cecb2095ada9bd12683ca801852.tar.gz | |
Change ZPP only if compiled with ICU >= 64
| -rw-r--r-- | ext/intl/locale/locale_methods.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/ext/intl/locale/locale_methods.c b/ext/intl/locale/locale_methods.c index 7356132b05..768ae84d2c 100644 --- a/ext/intl/locale/locale_methods.c +++ b/ext/intl/locale/locale_methods.c @@ -1554,11 +1554,17 @@ PHP_FUNCTION(locale_lookup) intl_error_reset( NULL ); - if(zend_parse_parameters( ZEND_NUM_ARGS(), "as|bS!", &arr, &loc_range, &loc_range_len, +#if U_ICU_VERSION_MAJOR_NUM > 63 +# define BANG "!" +#else +# define BANG +#endif + if(zend_parse_parameters( ZEND_NUM_ARGS(), "as|bS" BANG, &arr, &loc_range, &loc_range_len, &boolCanonical, &fallback_loc_str) == FAILURE) { intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR, "locale_lookup: unable to parse input params", 0 ); RETURN_FALSE; } +#undef BANG if(loc_range_len == 0) { if(fallback_loc_str) { |