Merge branch 'master' into integer_semantics

Conflicts:
	Zend/zend_operators.h

1 files changed, 3 insertions, 3 deletions

diff --git a/ext/intl/breakiterator/breakiterator_iterators.cpp b/ext/intl/breakiterator/breakiterator_iterators.cpp
index 7783235d8d..d8f18f99f3 100644
--- a/ext/intl/breakiterator/breakiterator_iterators.cpp
+++ b/ext/intl/breakiterator/breakiterator_iterators.cpp
@@ -67,7 +67,7 @@ static void _breakiterator_move_forward(zend_object_iterator *iter TSRMLS_DC)
 
 	int32_t pos = biter->next();
 	if (pos != BreakIterator::DONE) {
-		ZVAL_LONG(&zoi_iter->current, (long)pos);
+		ZVAL_LONG(&zoi_iter->current, (zend_long)pos);
 	} //else we've reached the end of the enum, nothing more is required
 }
 
@@ -77,7 +77,7 @@ static void _breakiterator_rewind(zend_object_iterator *iter TSRMLS_DC)
 	zoi_with_current *zoi_iter = (zoi_with_current*)iter;
 
 	int32_t pos = biter->first();
-	ZVAL_LONG(&zoi_iter->current, (long)pos);
+	ZVAL_LONG(&zoi_iter->current, (zend_long)pos);
 }
 
 static zend_object_iterator_funcs breakiterator_iterator_funcs = {
@@ -175,7 +175,7 @@ static void _breakiterator_parts_move_forward(zend_object_iterator *iter TSRMLS_
 		next = slen;
 	}
 	assert(next <= slen && next >= cur);
-	res = STR_ALLOC(next - cur, 0);
+	res = zend_string_alloc(next - cur, 0);
 
 	memcpy(res->val, &s[cur], res->len);
 	res->val[res->len] = '\0';