diff options
| author | Anatol Belski <ab@php.net> | 2016-04-09 19:12:16 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2016-04-09 19:12:16 +0200 |
| commit | 4e128978269dddfee2d1377a97241664194c4bb5 (patch) | |
| tree | c3a00817a3f536b959fc5ddb6960240cd3277694 | |
| parent | 956b3836fa2bc799722a4ca54e17b2b9823b6f82 (diff) | |
| parent | 58ea2ad4897b74b0a11d3da8a64c557ff18b0021 (diff) | |
| download | php-git-4e128978269dddfee2d1377a97241664194c4bb5.tar.gz | |
Merge branch 'PHP-7.0'
* PHP-7.0:
Fixed bug #65480 No declaration for msgformat_fix_quotes() in msgformat.c or msgformat_attr.c
| -rw-r--r-- | ext/intl/msgformat/msgformat.c | 1 | ||||
| -rw-r--r-- | ext/intl/msgformat/msgformat_attr.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/ext/intl/msgformat/msgformat.c b/ext/intl/msgformat/msgformat.c index e0919ec42b..d3f8416c03 100644 --- a/ext/intl/msgformat/msgformat.c +++ b/ext/intl/msgformat/msgformat.c @@ -23,6 +23,7 @@ #include "php_intl.h" #include "msgformat_class.h" +#include "msgformat_data.h" #include "intl_convert.h" /* {{{ */ diff --git a/ext/intl/msgformat/msgformat_attr.c b/ext/intl/msgformat/msgformat_attr.c index a20a7e411d..78eb727c61 100644 --- a/ext/intl/msgformat/msgformat_attr.c +++ b/ext/intl/msgformat/msgformat_attr.c @@ -21,11 +21,11 @@ #include "php_intl.h" #include "msgformat_class.h" #include "msgformat_attr.h" +#include "msgformat_data.h" #include "intl_convert.h" #include <unicode/ustring.h> - /* {{{ proto string MessageFormatter::getPattern( ) * Get formatter pattern. }}} */ /* {{{ proto string msgfmt_get_pattern( MessageFormatter $mf ) |