Merge pull request #945 from twwlogin/patch-2

Allow iov_base as char * on Solaris 8/9/10.
This commit is contained in:
Pieter Hintjens 2014-03-21 12:13:42 +02:00
commit 4706a18cf3

View File

@ -533,7 +533,7 @@ int zmq_recviov (void *s_, iovec *a_, size_t *count_, int flags_)
} }
a_[i].iov_len = zmq_msg_size (&msg); a_[i].iov_len = zmq_msg_size (&msg);
a_[i].iov_base = malloc(a_[i].iov_len); a_[i].iov_base = static_cast<char *> (malloc(a_[i].iov_len));
if (unlikely (!a_[i].iov_base)) { if (unlikely (!a_[i].iov_base)) {
errno = ENOMEM; errno = ENOMEM;
return -1; return -1;