Commit: befe4ab479a615298d93332b15ebcc69cee426bb Author: Gustavo Lopes <glo...@nebm.ist.utl.pt> Sun, 26 Aug 2012 23:42:57 +0200 Parents: 011af74b23fd419b34d4aee85cac39ffdd217665 886a50a619e55c9c1a5597449d6c71c69ff6fef8 Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=befe4ab479a615298d93332b15ebcc69cee426bb Log: 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 Changed paths: MM ext/intl/dateformat/dateformat_class.c MM ext/intl/php_intl.c Diff: diff --cc ext/intl/php_intl.c index 78da0f5,90e3573..d3d477c --- a/ext/intl/php_intl.c +++ b/ext/intl/php_intl.c @@@ -72,19 -68,9 +72,19 @@@ #include "transliterator/transliterator_class.h" #include "transliterator/transliterator_methods.h" +#include "timezone/timezone_class.h" +#include "timezone/timezone_methods.h" + +#include "calendar/calendar_class.h" +#include "calendar/calendar_methods.h" +#include "calendar/gregoriancalendar_methods.h" + +#include "breakiterator/breakiterator_class.h" +#include "breakiterator/breakiterator_iterators.h" + #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" -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
