com php-src: fix size & compilation on Darwin: ext/intl/uchar/uchar.c
| From: | Stanislav Malyshev | Date: | Mon, 19 Jan 2015 06:44:35 +0000 |
| Subject: | com php-src: fix size & compilation on Darwin: ext/intl/uchar/uchar.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-84164@lists.php.net to get a copy of this message | ||
Commit: 02402ae695f7e8136048aad3eb0127a870b97e1f
Author: Stanislav Malyshev <stas@php.net> Sun, 18 Jan 2015 22:43:32 -0800
Parents: 6c5b3df5fb5185afad1e427112d19b2eeb6603c6
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=02402ae695f7e8136048aad3eb0127a870b97e1f
Log:
fix size & compilation on Darwin
Changed paths:
M ext/intl/uchar/uchar.c
Diff:
diff --git a/ext/intl/uchar/uchar.c b/ext/intl/uchar/uchar.c
index b65417b..37060e0 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) ||