diff options
author | Christoph M. Becker <cmbecker69@gmx.de> | 2020-10-20 16:31:25 +0200 |
---|---|---|
committer | Christoph M. Becker <cmbecker69@gmx.de> | 2020-10-20 16:31:25 +0200 |
commit | a54f0f76801776d54df2eb28faabe6a6d51bd295 (patch) | |
tree | ca66385a83493dd343830c78fd1088db3c6dcbc1 | |
parent | 9cfd650697148e7a87a96f34e268b3f24e3df965 (diff) | |
parent | de58fb34c9dad0ce598eb53ee942628fd7c7b14a (diff) | |
download | php-git-a54f0f76801776d54df2eb28faabe6a6d51bd295.tar.gz |
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Add char* cast to avoid compiler warnings
-rw-r--r-- | ext/imap/php_imap.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/imap/php_imap.c b/ext/imap/php_imap.c index 4c80ace80b..9288b1efe9 100644 --- a/ext/imap/php_imap.c +++ b/ext/imap/php_imap.c @@ -3955,7 +3955,7 @@ PHP_FUNCTION(imap_mail_compose) efree(mystring); mystring=tempstring; } else if (bod) { - spprintf(&tempstring, 0, "%s%s%s", mystring, bod->contents.text.data ? bod->contents.text.data : "", CRLF); + spprintf(&tempstring, 0, "%s%s%s", mystring, bod->contents.text.data ? (char *) bod->contents.text.data : "", CRLF); efree(mystring); mystring=tempstring; } else { |