diff options
| author | Anatol Belski <ab@php.net> | 2018-02-16 13:41:13 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2018-02-16 13:41:13 +0100 |
| commit | 4800a95e72cefcb2bb7ac52394c0ce144c5a33d6 (patch) | |
| tree | 1bd316bd90eb1c339692d5d73c4bf7c589da1053 | |
| parent | 34ab10ef1b28116d4669dde935ec063a9fd11f04 (diff) | |
| parent | da0ed5cdb13b7a6ca59c2c1653c6f6665aec81d2 (diff) | |
| download | php-git-4800a95e72cefcb2bb7ac52394c0ce144c5a33d6.tar.gz | |
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Wrap var depending on conditional compilation
| -rw-r--r-- | ext/intl/spoofchecker/spoofchecker_create.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/ext/intl/spoofchecker/spoofchecker_create.c b/ext/intl/spoofchecker/spoofchecker_create.c index 8108cafa2f..34536f84a5 100644 --- a/ext/intl/spoofchecker/spoofchecker_create.c +++ b/ext/intl/spoofchecker/spoofchecker_create.c @@ -28,7 +28,9 @@ */ PHP_METHOD(Spoofchecker, __construct) { +#if U_ICU_VERSION_MAJOR_NUM < 58 int checks; +#endif zend_error_handling error_handling; SPOOFCHECKER_METHOD_INIT_VARS; |