com php-src: Make header C++ compatible: ext/standard/php_sma rt_str.h
| From: | Nikita Popov | Date: | Fri, 19 Sep 2014 21:54:58 +0000 |
| Subject: | com php-src: Make header C++ compatible: ext/standard/php_sma rt_str.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-81791@lists.php.net to get a copy of this message | ||
Commit: 0cd982f15c6d1df4672a927d0404caeb8380c193
Author: Nikita Popov <nikic@php.net> Fri, 19 Sep 2014 23:54:58 +0200
Parents: 31e842472f46d8aa32e2ef316da245f18806589d
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=0cd982f15c6d1df4672a927d0404caeb8380c193
Log:
Make header C++ compatible
Changed paths:
M ext/standard/php_smart_str.h
Diff:
diff --git a/ext/standard/php_smart_str.h b/ext/standard/php_smart_str.h
index 1c8c418..e32def2 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;