diff options
| author | Micael Karlberg <[email protected]> | 2011-10-12 11:19:20 +0200 |
|---|---|---|
| committer | Micael Karlberg <[email protected]> | 2011-10-12 11:19:20 +0200 |
| commit | c8515be586ee98aca2de19d2b1b0d2d5ca1174af (patch) | |
| tree | 35a70311d01e7bee3c592db84d9191a24e90d681 /erts/emulator/drivers | |
| parent | 8490c3a413ca4a89c0a2f37e8723b2105cbe2406 (diff) | |
| parent | 2dffccb293bb2bb6a9be3424240eb9b0e362a987 (diff) | |
| download | otp-c8515be586ee98aca2de19d2b1b0d2d5ca1174af.tar.gz otp-c8515be586ee98aca2de19d2b1b0d2d5ca1174af.tar.bz2 otp-c8515be586ee98aca2de19d2b1b0d2d5ca1174af.zip | |
Merge branch 'master' of super:otp into bmk/inets/inets58_integration
Diffstat (limited to 'erts/emulator/drivers')
| -rw-r--r-- | erts/emulator/drivers/common/inet_drv.c | 4 |
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; |