From: Nikita Popov Date: Fri, 19 Sep 2014 21:54:58 +0000 (+0200) Subject: Make header C++ compatible X-Git-Tag: POST_NATIVE_TLS_MERGE^2~173 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0cd982f15c6d1df4672a927d0404caeb8380c193;p=php Make header C++ compatible --- diff --git a/ext/standard/php_smart_str.h b/ext/standard/php_smart_str.h index 1c8c418370..e32def2307 100644 --- a/ext/standard/php_smart_str.h +++ b/ext/standard/php_smart_str.h @@ -66,7 +66,7 @@ static zend_always_inline size_t smart_str_alloc(smart_str *str, size_t len, zen newlen = str->s->len + len; if (newlen >= str->a) { str->a = newlen + SMART_STR_PREALLOC; - str->s = perealloc(str->s, _STR_HEADER_SIZE + str->a + 1, persistent); + str->s = (zend_string *) perealloc(str->s, _STR_HEADER_SIZE + str->a + 1, persistent); } } return newlen;