diff options
| author | Johannes Schlüter <johannes@php.net> | 2013-01-29 19:50:00 +0100 |
|---|---|---|
| committer | Johannes Schlüter <johannes@php.net> | 2013-01-29 19:50:00 +0100 |
| commit | 078b025a15a22c290f36e66b0c3336376623266e (patch) | |
| tree | fcf8dc6d71225f86848056b73d999053730b4e93 /ext/intl/breakiterator/breakiterator_class.cpp | |
| parent | d7d9ce0f4257d65527766b367aefcea25ef264f4 (diff) | |
| parent | 3bedc8ec277a246db6d3bfbe6313a861e46c4505 (diff) | |
| download | php-git-078b025a15a22c290f36e66b0c3336376623266e.tar.gz | |
Merge branch 'PHP-5.5' of git.php.net:/php-src into PHP-5.5
Diffstat (limited to 'ext/intl/breakiterator/breakiterator_class.cpp')
| -rw-r--r-- | ext/intl/breakiterator/breakiterator_class.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/intl/breakiterator/breakiterator_class.cpp b/ext/intl/breakiterator/breakiterator_class.cpp index de4bfbb7b0..7bf271a344 100644 --- a/ext/intl/breakiterator/breakiterator_class.cpp +++ b/ext/intl/breakiterator/breakiterator_class.cpp @@ -296,7 +296,7 @@ static const zend_function_entry BreakIterator_class_functions[] = { PHP_ME_MAPPING(following, breakiter_following, ainfo_biter_offset, ZEND_ACC_PUBLIC) PHP_ME_MAPPING(preceding, breakiter_preceding, ainfo_biter_offset, ZEND_ACC_PUBLIC) PHP_ME_MAPPING(isBoundary, breakiter_is_boundary, ainfo_biter_offset, ZEND_ACC_PUBLIC) - PHP_ME_MAPPING(getLocale, breakiter_get_locale, ainfo_biter_void, ZEND_ACC_PUBLIC) + PHP_ME_MAPPING(getLocale, breakiter_get_locale, ainfo_biter_get_locale, ZEND_ACC_PUBLIC) PHP_ME_MAPPING(getPartsIterator, breakiter_get_parts_iterator, ainfo_biter_getPartsIterator, ZEND_ACC_PUBLIC) PHP_ME_MAPPING(getErrorCode, breakiter_get_error_code, ainfo_biter_void, ZEND_ACC_PUBLIC) |