diff options
| author | Xinchen Hui <laruence@php.net> | 2012-06-07 14:42:35 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2012-06-07 14:42:35 +0800 |
| commit | 07d0eab204c19ceca259319c38af79e64b61aecd (patch) | |
| tree | 262d04f1902d9806062ec3df8d5825068e66aaf2 /ext/intl/msgformat/msgformat_class.h | |
| parent | c22a29b57639178581210ec377ea4e9909f828c9 (diff) | |
| parent | 83542dcf3b84767cc950e2def7b35ec3b4839edc (diff) | |
| download | php-git-07d0eab204c19ceca259319c38af79e64b61aecd.tar.gz | |
Merge branch 'PHP-5.4'
By Gustavo André dos Santos Lopes (4) and others
via Felipe Pena (2) and Xinchen Hui (2)
* PHP-5.4:
Remove unused codes
based on microsoft's description,the direct convert from FILETIME struct to __int64 is unsafe.
merge 5.3 entries
restore NEWS
Fix ext/intl build on ICU < 4.8
Optimization in ext/intl/msgformat
Fixed tests in ext/intl
Changed XFAILed collator_get_sort_key.phpt
Diffstat (limited to 'ext/intl/msgformat/msgformat_class.h')
| -rwxr-xr-x | ext/intl/msgformat/msgformat_class.h | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/ext/intl/msgformat/msgformat_class.h b/ext/intl/msgformat/msgformat_class.h index 0afa792ae3..b6b8e33226 100755 --- a/ext/intl/msgformat/msgformat_class.h +++ b/ext/intl/msgformat/msgformat_class.h @@ -19,9 +19,11 @@ #include <php.h> -#include "intl_common.h" -#include "intl_error.h" -#include "intl_data.h" +#include <unicode/uconfig.h> + +#include "../intl_common.h" +#include "../intl_error.h" +#include "../intl_data.h" #include "msgformat_data.h" typedef struct { @@ -38,4 +40,8 @@ extern zend_class_entry *MessageFormatter_ce_ptr; #define MSG_FORMAT_METHOD_FETCH_OBJECT INTL_METHOD_FETCH_OBJECT(MessageFormatter, mfo) #define MSG_FORMAT_OBJECT(mfo) (mfo)->mf_data.umsgf +#if U_ICU_VERSION_MAJOR_NUM * 10 + U_ICU_VERSION_MINOR_NUM < 48 +# define MSG_FORMAT_QUOTE_APOS 1 +#endif + #endif // #ifndef MSG_FORMAT_CLASS_H |