diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2022-09-08 14:18:10 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2022-09-08 14:18:10 (GMT) |
| commit | c0ad0edfe03a4a4119f22763f04cae0bf8f94282 (patch) | |
| tree | 035d67b22eb527608cbd45d864d394b89064412a /unix/tclUnixSock.c | |
| parent | c603f00cf1e79360cab83bed72e551df8b19fe56 (diff) | |
| parent | 607e3a5ba3c721c845b29c89db243882f25c5ba5 (diff) | |
| download | tcl-c0ad0edfe03a4a4119f22763f04cae0bf8f94282.zip tcl-c0ad0edfe03a4a4119f22763f04cae0bf8f94282.tar.gz tcl-c0ad0edfe03a4a4119f22763f04cae0bf8f94282.tar.bz2 | |
Merge 8.7
Diffstat (limited to 'unix/tclUnixSock.c')
| -rw-r--r-- | unix/tclUnixSock.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/unix/tclUnixSock.c b/unix/tclUnixSock.c index 2361b91..7f22796 100644 --- a/unix/tclUnixSock.c +++ b/unix/tclUnixSock.c @@ -54,9 +54,9 @@ typedef struct TcpFdList { struct TcpState { Tcl_Channel channel; /* Channel associated with this file. */ - TcpFdList fds; /* The file descriptors of the sockets. */ int flags; /* ORed combination of the bitfields defined * below. */ + TcpFdList fds; /* The file descriptors of the sockets. */ int interest; /* Event types of interest */ /* @@ -79,8 +79,6 @@ struct TcpState { * an async socket is not yet connected. */ int connectError; /* Cache SO_ERROR of async socket. */ int cachedBlocking; /* Cache blocking mode of async socket. */ - int testFlags; /* bit field for tests. Is set by testsocket - * test procedure */ }; /* @@ -96,12 +94,7 @@ struct TcpState { * still pending */ #define TCP_ASYNC_FAILED (1<<5) /* An async connect finally failed */ -/* - * These bits may be ORed together into the "testFlags" field of a TcpState - * structure. - */ - -#define TCP_ASYNC_TEST_MODE (1<<0) /* Async testing activated. Do not +#define TCP_ASYNC_TEST_MODE (1<<8) /* Async testing activated. Do not * automatically continue connection * process. */ @@ -475,7 +468,7 @@ WaitForConnect( * (errorCodePtr != NULL && !GOT_BITS(flags, TCP_NONBLOCKING)) */ - if (GOT_BITS(statePtr->testFlags, TCP_ASYNC_TEST_MODE) + if (GOT_BITS(statePtr->flags, TCP_ASYNC_TEST_MODE) && !(errorCodePtr != NULL && !GOT_BITS(statePtr->flags, TCP_NONBLOCKING))) { *errorCodePtr = EWOULDBLOCK; |