diff options
| author | Christopher Jones <sixd@php.net> | 2013-09-13 16:44:10 -0700 |
|---|---|---|
| committer | Christopher Jones <sixd@php.net> | 2013-09-13 16:44:10 -0700 |
| commit | c4df19187aa36fab03275e62f29a5ccf8b6d2631 (patch) | |
| tree | 532965e3703e8bdacbc2136443df6685326aec1a /Zend | |
| parent | e03a3d55d817aed64c025e49b4472ac2e8904cfe (diff) | |
| parent | 8748e146b98fb79e66e3be40b211005e36031d64 (diff) | |
| download | php-git-c4df19187aa36fab03275e62f29a5ccf8b6d2631.tar.gz | |
Merge branch 'master' of https://git.php.net/repository/php-src
# By Nikita Popov
# Via Nikita Popov
* 'master' of https://git.php.net/repository/php-src:
Fix intl build
Diffstat (limited to 'Zend')
| -rw-r--r-- | Zend/zend_string.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Zend/zend_string.h b/Zend/zend_string.h index 725e069ed2..27ba50be3d 100644 --- 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; } |