diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2017-06-23 13:31:39 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2017-06-23 13:31:39 +0200 |
| commit | 721de5b54229724b3d77b134a33794f0f0961904 (patch) | |
| tree | bb98ceb615cbed5dbdd8d15280f5e73a403feda0 /ext/standard | |
| parent | bd8940a1fec0986b16681585d3b3314135f1eef3 (diff) | |
| parent | 4d6100569b7611ef66086bec96fe8b5046e30ef7 (diff) | |
| download | php-git-721de5b54229724b3d77b134a33794f0f0961904.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
Diffstat (limited to 'ext/standard')
| -rw-r--r-- | ext/standard/php_smart_string.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/standard/php_smart_string.h b/ext/standard/php_smart_string.h index f3c4087e26..adb78c0318 100644 --- a/ext/standard/php_smart_string.h +++ b/ext/standard/php_smart_string.h @@ -50,7 +50,7 @@ #endif #define SMART_STRING_DO_REALLOC(d, what) \ - (d)->c = SMART_STRING_REALLOC((d)->c, (d)->a + 1, (what)) + (d)->c = (char *) SMART_STRING_REALLOC((d)->c, (d)->a + 1, (what)) #define smart_string_alloc4(d, n, what, newlen) do { \ if (!(d)->c) { \ |