aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/drivers/common
diff options
context:
space:
mode:
authorRaimo Niskanen <[email protected]>2010-12-03 17:55:58 +0100
committerRaimo Niskanen <[email protected]>2010-12-03 17:55:58 +0100
commit0878f9b9daa32c5c0ec4fc3ca349bf5ba4455b8b (patch)
tree0580fe7b6b6d80866f67679df9d5a6d5826e513b /erts/emulator/drivers/common
parent80d817c9a014d66e81cbb42c669cc8b3c7af8ef2 (diff)
parent0d79832e450c49e51f5fd7149f5f72930ef1f966 (diff)
downloadotp-0878f9b9daa32c5c0ec4fc3ca349bf5ba4455b8b.tar.gz
otp-0878f9b9daa32c5c0ec4fc3ca349bf5ba4455b8b.tar.bz2
otp-0878f9b9daa32c5c0ec4fc3ca349bf5ba4455b8b.zip
Merge branch 'pan/inet6_corrections/OTP-8969' into dev
* pan/inet6_corrections/OTP-8969: Stop using uncertain flags for getaddrinfo() Teach inet_test_lib to understand enetunreach Make windows inet_gethost work for ipv6
Diffstat (limited to 'erts/emulator/drivers/common')
-rw-r--r--erts/emulator/drivers/common/inet_drv.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/erts/emulator/drivers/common/inet_drv.c b/erts/emulator/drivers/common/inet_drv.c
index 6f56cab575..1382d1dfe4 100644
--- a/erts/emulator/drivers/common/inet_drv.c
+++ b/erts/emulator/drivers/common/inet_drv.c
@@ -5823,9 +5823,12 @@ static int sctp_set_opts(inet_descriptor* desc, char* ptr, int len)
char *after;
# ifdef HAVE_STRUCT_SCTP_PADDRPARAMS_SPP_FLAGS
int eflags, cflags, hb_enable, hb_disable,
- pmtud_enable, pmtud_disable,
+ pmtud_enable, pmtud_disable;
+# ifdef HAVE_STRUCT_SCTP_PADDRPARAMS_SPP_SACKDELAY
+ int
sackdelay_enable, sackdelay_disable;
# endif
+# endif
CHKLEN(curr, ASSOC_ID_LEN);
arg.pap.spp_assoc_id = GET_ASSOC_ID(curr); curr += ASSOC_ID_LEN;