Merge branch 'master' of https://git.php.net/repository/php-src

cjbj · cjbj · commit c4df19187aa3 · 2013-09-13T16:44:10.000-07:00
# By Nikita Popov # Via Nikita Popov * 'master' of https://git.php.net/repository/php-src: Fix intl build
diff --git a/Zend/zend_string.h b/Zend/zend_string.h
@@ -74,7 +74,7 @@ END_EXTERN_C()
 	 : erealloc(str, new_len))
 
 static inline char *_str_erealloc(char *str, size_t new_len, size_t old_len) {
-	char *buf = emalloc(new_len);
+	char *buf = (char *) emalloc(new_len);
 	memcpy(buf, str, old_len);
 	return buf;
 }

Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ END_EXTERN_C()`
`74`	`74`	`: erealloc(str, new_len))`
`75`	`75`
`76`	`76`	`static inline char _str_erealloc(char str, size_t new_len, size_t old_len) {`
`77`		`- char *buf = emalloc(new_len);`
	`77`	`+ char buf = (char ) emalloc(new_len);`
`78`	`78`	`memcpy(buf, str, old_len);`
`79`	`79`	`return buf;`
`80`	`80`	`}`