Changeset 643dfc4 for protocols/oscar/conn.c

Timestamp:

2005-12-17T01:25:58Z (18 years ago)

Author:

Jelmer Vernooij <jelmer@…>

Branches:

master

Children:

e3fb678

Parents:

4146a07 (diff), 32c632f (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge integration

File:

• protocols/oscar/conn.c (modified) (1 diff)

protocols/oscar/conn.c

@@ -627 +627 @@
         }
 
-#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;