diff options
| author | Andrea Faulds <ajf@ajf.me> | 2014-09-16 13:45:06 +0100 |
|---|---|---|
| committer | Andrea Faulds <ajf@ajf.me> | 2014-09-16 13:45:06 +0100 |
| commit | db72160e5ac2b267b9ffa23ad84e62e609382a44 (patch) | |
| tree | 6e50c2826f98308d500cc826934a503751d4d566 /ext/intl/msgformat/msgformat_format.c | |
| parent | be88d0e5d4ab5fdf775f3e38cf054aa0451f0d36 (diff) | |
| parent | f469dc7429f2257aac6f46228302408608fbd62f (diff) | |
| download | php-git-db72160e5ac2b267b9ffa23ad84e62e609382a44.tar.gz | |
Merge branch 'master' into integer_semantics
Conflicts:
Zend/zend_operators.h
Diffstat (limited to 'ext/intl/msgformat/msgformat_format.c')
| -rw-r--r-- | ext/intl/msgformat/msgformat_format.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/intl/msgformat/msgformat_format.c b/ext/intl/msgformat/msgformat_format.c index e661c3c17f..cb81137316 100644 --- a/ext/intl/msgformat/msgformat_format.c +++ b/ext/intl/msgformat/msgformat_format.c @@ -101,9 +101,9 @@ PHP_FUNCTION( msgfmt_format_message ) UChar *spattern = NULL; int spattern_len = 0; char *pattern = NULL; - int pattern_len = 0; + size_t pattern_len = 0; const char *slocale = NULL; - int slocale_len = 0; + size_t slocale_len = 0; MessageFormatter_object mf = {0}; MessageFormatter_object *mfo = &mf; |