]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4'
authorGustavo Lopes <glopes@nebm.ist.utl.pt>
Sun, 26 Aug 2012 21:42:57 +0000 (23:42 +0200)
committerGustavo Lopes <glopes@nebm.ist.utl.pt>
Sun, 26 Aug 2012 21:42:57 +0000 (23:42 +0200)
* 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

1  2 
ext/intl/dateformat/dateformat_class.c
ext/intl/php_intl.c

index 78da0f5e32b0cd9d2b4797749d346cf35c6c92a0,90e3573c1b51d763b98f3c1b43922ea32d8c1412..d3d477c97159d165ac855ea096814fa36928e36b
  #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"