aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/drivers/common
diff options
context:
space:
mode:
authorBjörn Gustavsson <[email protected]>2011-10-11 13:51:44 +0200
committerBjörn Gustavsson <[email protected]>2011-10-11 13:51:44 +0200
commit2dffccb293bb2bb6a9be3424240eb9b0e362a987 (patch)
tree7be29509bcedc504641dba93a587352bae24d591 /erts/emulator/drivers/common
parent6ca6dd3c670fb8185ebb9a20c2a731a7375c1cac (diff)
parentc250fb907317bffbc17f7c3d962fa083d124f444 (diff)
downloadotp-2dffccb293bb2bb6a9be3424240eb9b0e362a987.tar.gz
otp-2dffccb293bb2bb6a9be3424240eb9b0e362a987.tar.bz2
otp-2dffccb293bb2bb6a9be3424240eb9b0e362a987.zip
Merge branch 'bjorn/some-configure-clean-ups'
* bjorn/some-configure-clean-ups: erts/configure.in: Remove test for reversed setvbuf() arguments erts/configure.in: Remove broken support for System V erts/configure.in: Don't check for the presence of mach-o/dyld.h erts/configure.in: Remove useless --disable-fixalloc option
Diffstat (limited to 'erts/emulator/drivers/common')
-rw-r--r--erts/emulator/drivers/common/inet_drv.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/erts/emulator/drivers/common/inet_drv.c b/erts/emulator/drivers/common/inet_drv.c
index 43114c6039..426917bd2c 100644
--- a/erts/emulator/drivers/common/inet_drv.c
+++ b/erts/emulator/drivers/common/inet_drv.c
@@ -9307,7 +9307,7 @@ static int tcp_inet_output(tcp_descriptor* desc, HANDLE event)
goto done;
}
}
-#endif /* SOCKOPT_CONNECT_STAT */
+#endif /* SO_ERROR */
#endif /* !__WIN32__ */
desc->inet.state = TCP_STATE_CONNECTED;
@@ -10112,7 +10112,7 @@ static int packet_inet_output(udp_descriptor* udesc, HANDLE event)
goto done;
}
}
-#endif /* SOCKOPT_CONNECT_STAT */
+#endif /* SO_ERROR */
#endif /* !__WIN32__ */
desc->state = PACKET_STATE_CONNECTED;