diff options
| author | dkf <donal.k.fellows@manchester.ac.uk> | 2012-05-06 17:33:19 (GMT) |
|---|---|---|
| committer | dkf <donal.k.fellows@manchester.ac.uk> | 2012-05-06 17:33:19 (GMT) |
| commit | cfc88759ab9d2a7118cb286943fc3074b430804b (patch) | |
| tree | 02e14967bdeaf76e67719c5ee06443dc36b3ffa3 /unix/tclUnixSock.c | |
| parent | 21ffddf58f04c4a455f133435b83bc79da913805 (diff) | |
| parent | 14452102b5028ba9b20ceae48237a751f97f3b43 (diff) | |
| download | tcl-cfc88759ab9d2a7118cb286943fc3074b430804b.zip tcl-cfc88759ab9d2a7118cb286943fc3074b430804b.tar.gz tcl-cfc88759ab9d2a7118cb286943fc3074b430804b.tar.bz2 | |
merge trunk
Diffstat (limited to 'unix/tclUnixSock.c')
| -rw-r--r-- | unix/tclUnixSock.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/unix/tclUnixSock.c b/unix/tclUnixSock.c index 8c94e7f..e48cc2b 100644 --- a/unix/tclUnixSock.c +++ b/unix/tclUnixSock.c @@ -24,6 +24,8 @@ #define SOCK_CHAN_LENGTH 4 + sizeof(void*) * 2 + 1 #define SOCK_TEMPLATE "sock%lx" +#undef SOCKET /* Possible conflict with win32 SOCKET */ + /* * This is needed to comply with the strict aliasing rules of GCC, but it also * simplifies casting between the different sockaddr types. @@ -1030,7 +1032,8 @@ CreateClientSocket( state->status = status; } if (status == 0) { - goto out; + CLEAR_BITS(state->flags, TCP_ASYNC_CONNECT); + goto out; } } } @@ -1041,7 +1044,6 @@ out: /* * An asynchonous connection has finally succeeded or failed. */ - CLEAR_BITS(state->flags, TCP_ASYNC_CONNECT); TcpWatchProc(state, state->filehandlers); TclUnixSetBlockingMode(state->fds.fd, state->cachedBlocking); |