summaryrefslogtreecommitdiff
path: root/ext/mbstring/php_unicode.h
diff options
context:
space:
mode:
authorNikita Popov <nikita.ppv@gmail.com>2017-07-19 23:50:14 +0200
committerNikita Popov <nikita.ppv@gmail.com>2017-07-19 23:59:42 +0200
commit9c73be898d4e5aa2e64b21da14797ec9ad202134 (patch)
tree0a476d521fa9a57a9e9c023e77224b1c838e4d4b /ext/mbstring/php_unicode.h
parent4128746b949355f588143ef18ad98fdfda089873 (diff)
downloadphp-git-9c73be898d4e5aa2e64b21da14797ec9ad202134.tar.gz
Directly accept encoding in php_unicode_convert_case()
As a side-effect mb_strtolower() and mb_strtoupper() now correctly handle a NULL encoding parameter by using the internal encoding. This is what caused the two test changes.
Diffstat (limited to 'ext/mbstring/php_unicode.h')
-rw-r--r--ext/mbstring/php_unicode.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/ext/mbstring/php_unicode.h b/ext/mbstring/php_unicode.h
index ac6dd6e57a..3a6c75ce86 100644
--- a/ext/mbstring/php_unicode.h
+++ b/ext/mbstring/php_unicode.h
@@ -94,8 +94,10 @@
MBSTRING_API int php_unicode_is_prop(unsigned long code, ...);
MBSTRING_API int php_unicode_is_prop1(unsigned long code, int prop);
-MBSTRING_API char *php_unicode_convert_case(int case_mode, const char *srcstr, size_t srclen, size_t *retlen,
- const char *src_encoding);
+
+MBSTRING_API char *php_unicode_convert_case(
+ int case_mode, const char *srcstr, size_t srclen, size_t *retlen,
+ const mbfl_encoding *src_encoding);
#define PHP_UNICODE_CASE_UPPER 0
#define PHP_UNICODE_CASE_LOWER 1