diff options
| author | Xinchen Hui <laruence@php.net> | 2015-01-19 01:37:13 -0500 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2015-01-19 01:37:13 -0500 |
| commit | 0bf9326512948f3c44dc33ff1b6b5613649d5761 (patch) | |
| tree | 5a2b28dcd69e4ae42597fbb2454ff443bde2a611 | |
| parent | 020b51b46eceb1a8c2876aac263772ed55ba9a1a (diff) | |
| parent | 02402ae695f7e8136048aad3eb0127a870b97e1f (diff) | |
| download | php-git-0bf9326512948f3c44dc33ff1b6b5613649d5761.tar.gz | |
Merge branch 'master' of https://git.php.net/repository/php-src
| -rw-r--r-- | UPGRADING | 8 | ||||
| -rw-r--r-- | ext/intl/uchar/uchar.c | 5 |
2 files changed, 7 insertions, 6 deletions
@@ -99,9 +99,6 @@ PHP X.Y UPGRADE NOTES and heredocs. . define() now supports arrays as constant values, fixing an oversight where define() did not support arrays yet const syntax did. -- Standard - . intdiv() function for integer division added. - ======================================== 3. Changes in SAPI modules ======================================== @@ -133,7 +130,10 @@ PHP X.Y UPGRADE NOTES 6. New Functions ======================================== - GMP - . Added gmp_random_seed() + . Added gmp_random_seed(). + +- Standard + . Added intdiv() function for integer division. ======================================== 7. New Classes and Interfaces diff --git a/ext/intl/uchar/uchar.c b/ext/intl/uchar/uchar.c index b65417bc60..37060e022d 100644 --- a/ext/intl/uchar/uchar.c +++ b/ext/intl/uchar/uchar.c @@ -6,7 +6,7 @@ #define IC_METHOD(mname) PHP_METHOD(IntlChar, mname) -inline int convert_cp(UChar32* pcp, zval *zcp) { +static inline int convert_cp(UChar32* pcp, zval *zcp) { zend_long cp = -1; if (Z_TYPE_P(zcp) == IS_LONG) { cp = Z_LVAL_P(zcp); @@ -534,7 +534,8 @@ IC_METHOD(getFC_NFKC_Closure) { zval *zcp; UChar *closure; char *ret; - int32_t closure_len, ret_len; + int32_t closure_len; + size_t ret_len; UErrorCode error = U_ZERO_ERROR; if ((zend_parse_parameters(ZEND_NUM_ARGS(), "z", &zcp) == FAILURE) || |