diff options
| author | Gustavo Lopes <glopes@nebm.ist.utl.pt> | 2012-08-26 23:42:57 +0200 |
|---|---|---|
| committer | Gustavo Lopes <glopes@nebm.ist.utl.pt> | 2012-08-26 23:42:57 +0200 |
| commit | befe4ab479a615298d93332b15ebcc69cee426bb (patch) | |
| tree | 9a3c2c644b68f7c5cb5027ad761ee155eb00c7d1 /ext/intl/php_intl.c | |
| parent | 011af74b23fd419b34d4aee85cac39ffdd217665 (diff) | |
| parent | 886a50a619e55c9c1a5597449d6c71c69ff6fef8 (diff) | |
| download | php-git-befe4ab479a615298d93332b15ebcc69cee426bb.tar.gz | |
Merge branch 'PHP-5.4'
* PHP-5.4:
Fixed defective cloning in ext/intl classes
NEWS for commit 72c807a
Allow Spoofchecker to be registered on ICU 49.1
Announce on NEWS change in 1ce572c
Diffstat (limited to 'ext/intl/php_intl.c')
| -rw-r--r-- | ext/intl/php_intl.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/intl/php_intl.c b/ext/intl/php_intl.c index 78da0f5e32..d3d477c971 100644 --- a/ext/intl/php_intl.c +++ b/ext/intl/php_intl.c @@ -84,7 +84,7 @@ #include "idn/idn.h" -#if U_ICU_VERSION_MAJOR_NUM > 3 && U_ICU_VERSION_MINOR_NUM >=2 +#if U_ICU_VERSION_MAJOR_NUM * 1000 + U_ICU_VERSION_MINOR_NUM >= 4002 # include "spoofchecker/spoofchecker_class.h" # include "spoofchecker/spoofchecker.h" # include "spoofchecker/spoofchecker_create.h" @@ -963,7 +963,7 @@ PHP_MINIT_FUNCTION( intl ) /* Expose IDN constants to PHP scripts. */ idn_register_constants(INIT_FUNC_ARGS_PASSTHRU); -#if U_ICU_VERSION_MAJOR_NUM > 3 && U_ICU_VERSION_MINOR_NUM >=2 +#if U_ICU_VERSION_MAJOR_NUM * 1000 + U_ICU_VERSION_MINOR_NUM >= 4002 /* Register 'Spoofchecker' PHP class */ spoofchecker_register_Spoofchecker_class( TSRMLS_C ); |