From: Gustavo Lopes <glopes@nebm.ist.utl.pt>
Date: Sun, 26 Aug 2012 21:42:57 +0000 (+0200)
Subject: Merge branch 'PHP-5.4'
X-Git-Tag: php-5.5.0alpha1~20^2~22^2~11
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=befe4ab479a615298d93332b15ebcc69cee426bb;p=php

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
---

befe4ab479a615298d93332b15ebcc69cee426bb
diff --cc ext/intl/php_intl.c
index 78da0f5e32,90e3573c1b..d3d477c971
--- 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"