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_data.c | |
| 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_data.c')
| -rwxr-xr-x | ext/intl/msgformat/msgformat_data.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/ext/intl/msgformat/msgformat_data.c b/ext/intl/msgformat/msgformat_data.c index 62e034bebc..5d49054473 100755 --- a/ext/intl/msgformat/msgformat_data.c +++ b/ext/intl/msgformat/msgformat_data.c @@ -21,6 +21,8 @@ #include <unicode/ustring.h> #include "msgformat_data.h" +#include "msgformat_class.h" + /* {{{ void msgformat_data_init( msgformat_data* mf_data ) * Initialize internals of msgformat_data. */ @@ -77,6 +79,7 @@ msgformat_data* msgformat_data_create( TSRMLS_D ) } /* }}} */ +#ifdef MSG_FORMAT_QUOTE_APOS int msgformat_fix_quotes(UChar **spattern, uint32_t *spattern_len, UErrorCode *ec) { if(*spattern && *spattern_len && u_strchr(*spattern, (UChar)'\'')) { @@ -94,6 +97,7 @@ int msgformat_fix_quotes(UChar **spattern, uint32_t *spattern_len, UErrorCode *e } return SUCCESS; } +#endif /* |