diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2017-06-23 13:32:32 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2017-06-23 13:32:51 +0200 |
| commit | 748069e3a0aa0cd6249e687486a5043eb9dede9d (patch) | |
| tree | 18ca9966e80742b343ff2b8d3782e0a3294bef53 | |
| parent | a79ec404b21367ba89e8b3fda157c01d8d60edbf (diff) | |
| parent | 721de5b54229724b3d77b134a33794f0f0961904 (diff) | |
| download | php-git-748069e3a0aa0cd6249e687486a5043eb9dede9d.tar.gz | |
Merge branch 'PHP-7.1'
| -rw-r--r-- | Zend/zend_smart_string.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Zend/zend_smart_string.h b/Zend/zend_smart_string.h index 5dd42eb13c..8013533459 100644 --- a/Zend/zend_smart_string.h +++ b/Zend/zend_smart_string.h @@ -44,7 +44,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)) /* wrapper */ |