aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGustav Simonsson <[email protected]>2012-03-20 11:07:03 +0100
committerGustav Simonsson <[email protected]>2012-03-20 11:07:10 +0100
commit28b02062268eece4087b2e441b374ee00e721665 (patch)
tree38736ae4bb75ec2be26f7e9a66faea08c205a902
parentd25cb373c7046eeadce5fffe7ab8301d8c03d647 (diff)
parent4f3dd18814bbcc75608bbb56a09b844137b76823 (diff)
downloadotp-28b02062268eece4087b2e441b374ee00e721665.tar.gz
otp-28b02062268eece4087b2e441b374ee00e721665.tar.bz2
otp-28b02062268eece4087b2e441b374ee00e721665.zip
Merge branch 'ps/inet6-less-build-fix' into maint
* ps/inet6-less-build-fix: Add missing HAVE_IN6 && AF_INET6 ifdef OTP-9996
-rw-r--r--erts/emulator/drivers/common/inet_drv.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/erts/emulator/drivers/common/inet_drv.c b/erts/emulator/drivers/common/inet_drv.c
index 060d72199d..d1c2dbf94c 100644
--- a/erts/emulator/drivers/common/inet_drv.c
+++ b/erts/emulator/drivers/common/inet_drv.c
@@ -4095,6 +4095,7 @@ static char* buf_to_sockaddr(char* ptr, char* end, struct sockaddr* addr)
addr->sa_family = AF_INET;
return ptr + sizeof(struct in_addr);
}
+#if defined(HAVE_IN6) && defined(AF_INET6)
case INET_AF_INET6: {
struct in6_addr *p = &((struct sockaddr_in6*)addr)->sin6_addr;
buf_check(ptr,end,sizeof(struct in6_addr));
@@ -4102,6 +4103,7 @@ static char* buf_to_sockaddr(char* ptr, char* end, struct sockaddr* addr)
addr->sa_family = AF_INET6;
return ptr + sizeof(struct in6_addr);
}
+#endif
}
error:
return NULL;