diff options
| author | Gustav Simonsson <[email protected]> | 2012-03-20 11:09:37 +0100 |
|---|---|---|
| committer | Gustav Simonsson <[email protected]> | 2012-03-20 11:09:37 +0100 |
| commit | 4e932ecacbb0c98b4ca0560c6bb0b72a5f267bd9 (patch) | |
| tree | 2cfeb69743909ea299421dbabcc1ad5107cb92e5 /erts | |
| parent | 805e559417c2364ec27c212a49a23a48e2a97da4 (diff) | |
| parent | 28b02062268eece4087b2e441b374ee00e721665 (diff) | |
| download | otp-4e932ecacbb0c98b4ca0560c6bb0b72a5f267bd9.tar.gz otp-4e932ecacbb0c98b4ca0560c6bb0b72a5f267bd9.tar.bz2 otp-4e932ecacbb0c98b4ca0560c6bb0b72a5f267bd9.zip | |
Merge branch 'maint'
Diffstat (limited to 'erts')
| -rw-r--r-- | erts/emulator/drivers/common/inet_drv.c | 2 |
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 e98252e35d..2287699c46 100644 --- a/erts/emulator/drivers/common/inet_drv.c +++ b/erts/emulator/drivers/common/inet_drv.c @@ -4101,6 +4101,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)); @@ -4108,6 +4109,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; |