aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/nifs/common/socket_util.c
diff options
context:
space:
mode:
authorMicael Karlberg <[email protected]>2019-03-04 16:55:21 +0100
committerMicael Karlberg <[email protected]>2019-03-04 16:55:21 +0100
commitc3d9459c6310157a577a557bad870ec27ae86d46 (patch)
treec6f9e7529b500857f63006cdc70da5d5874c6a0d /erts/emulator/nifs/common/socket_util.c
parent5f0420e1708fe0a4ad73c458ec69c57a197813fa (diff)
parent270b5a02c47fa54a773e8f9df3b0c2bfe972da1d (diff)
downloadotp-c3d9459c6310157a577a557bad870ec27ae86d46.tar.gz
otp-c3d9459c6310157a577a557bad870ec27ae86d46.tar.bz2
otp-c3d9459c6310157a577a557bad870ec27ae86d46.zip
Merge branch 'bmk/20190304/openindiana_types' into bmk/20190301/cleanup_through_macro_abuse/OTP-15565
Diffstat (limited to 'erts/emulator/nifs/common/socket_util.c')
-rw-r--r--erts/emulator/nifs/common/socket_util.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/emulator/nifs/common/socket_util.c b/erts/emulator/nifs/common/socket_util.c
index f6e4781977..b817ae7636 100644
--- a/erts/emulator/nifs/common/socket_util.c
+++ b/erts/emulator/nifs/common/socket_util.c
@@ -177,7 +177,7 @@ char* esock_decode_iov(ErlNifEnv* env,
return ESOCK_STR_EINVAL;
if (IS_BIN(env, elem) && GET_BIN(env, elem, &bufs[i])) {
- iov[i].iov_base = bufs[i].data;
+ iov[i].iov_base = (caddr_t) bufs[i].data;
iov[i].iov_len = bufs[i].size;
sz += bufs[i].size;
} else {