diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2005-12-17 02:25:58 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2005-12-17 02:25:58 +0100 |
| commit | 643dfc4be2e84dc4acb1a446867705e150480210 (patch) | |
| tree | 90fe517fcac9490972f64b8cd99ec2f658c71359 /protocols/oscar/conn.c | |
| parent | 4146a07de5f44f3ea00a3ef0026098b28e7451de (diff) | |
| parent | 32c632fb46e58043a2d437c44cad783a59b7aea9 (diff) | |
Merge integration
Diffstat (limited to 'protocols/oscar/conn.c')
| -rw-r--r-- | protocols/oscar/conn.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/protocols/oscar/conn.c b/protocols/oscar/conn.c index 0155e5bc..77ffd50f 100644 --- a/protocols/oscar/conn.c +++ b/protocols/oscar/conn.c @@ -626,9 +626,7 @@ int aim_conn_completeconnect(aim_session_t *sess, aim_conn_t *conn) return -1; } -#ifndef _WIN32 - fcntl(conn->fd, F_SETFL, 0); /* XXX should restore original flags */ -#endif + sock_make_blocking(conn->fd); conn->status &= ~AIM_CONN_STATUS_INPROGRESS; |