diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2022-09-07 13:26:09 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2022-09-07 13:26:09 (GMT) |
| commit | b9b527183ac69f9f311eff0b2dce73e289985bad (patch) | |
| tree | 13e65ad5b8a131bb62c22b7ff381c154a5f7aab5 /unix | |
| parent | 446587dc917e9cf5f049686be2ce20822d4c22ab (diff) | |
| parent | 67be0a6752a150bad176f36988e3af03f25cc4d3 (diff) | |
| download | tcl-b9b527183ac69f9f311eff0b2dce73e289985bad.zip tcl-b9b527183ac69f9f311eff0b2dce73e289985bad.tar.gz tcl-b9b527183ac69f9f311eff0b2dce73e289985bad.tar.bz2 | |
Merge 8.7
Diffstat (limited to 'unix')
| -rw-r--r-- | unix/tclUnixSock.c | 12 | ||||
| -rw-r--r-- | unix/tclooConfig.sh | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/unix/tclUnixSock.c b/unix/tclUnixSock.c index d2068c3..1c07e8d 100644 --- a/unix/tclUnixSock.c +++ b/unix/tclUnixSock.c @@ -53,8 +53,6 @@ typedef struct TcpFdList { struct TcpState { Tcl_Channel channel; /* Channel associated with this file. */ - int testFlags; /* bit field for tests. Is set by testsocket - * test procedure */ TcpFdList fds; /* The file descriptors of the sockets. */ int flags; /* ORed combination of the bitfields defined * below. */ @@ -80,6 +78,8 @@ 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 */ }; /* @@ -434,7 +434,7 @@ TcpBlockModeProc( * * Side effects: * Processes socket events off the system queue. May process - * asynchroneous connects. + * asynchronous connects. * *---------------------------------------------------------------------- */ @@ -880,8 +880,8 @@ TcpGetOptionProc( if ((len > 1) && (optionName[1] == 'c') && (strncmp(optionName, "-connecting", len) == 0)) { - Tcl_DStringAppend(dsPtr, - GOT_BITS(statePtr->flags, TCP_ASYNC_CONNECT) ? "1" : "0", TCL_INDEX_NONE); + Tcl_DStringAppend(dsPtr, + GOT_BITS(statePtr->flags, TCP_ASYNC_CONNECT) ? "1" : "0", TCL_INDEX_NONE); return TCL_OK; } @@ -1351,7 +1351,7 @@ TcpConnect( } /* - * We need to forward the writable event that brought us here, bcasue + * We need to forward the writable event that brought us here, because * upon reading of getsockopt(SO_ERROR), at least some OSes clear the * writable state from the socket, and so a subsequent select() on * behalf of a script level [fileevent] would not fire. It doesn't diff --git a/unix/tclooConfig.sh b/unix/tclooConfig.sh index 4c2068c..a400b5b 100644 --- a/unix/tclooConfig.sh +++ b/unix/tclooConfig.sh @@ -16,4 +16,4 @@ TCLOO_STUB_LIB_SPEC="" TCLOO_INCLUDE_SPEC="" TCLOO_PRIVATE_INCLUDE_SPEC="" TCLOO_CFLAGS="" -TCLOO_VERSION=1.2.0 +TCLOO_VERSION=1.3 |