diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2022-06-02 16:09:33 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2022-06-02 16:09:33 (GMT) |
| commit | 930a43ed48071b5047e9095dbf45408a3a82daca (patch) | |
| tree | 41de6eb20e63ea854b5adfe7fa3896338ec2a0f6 /unix/tclUnixSock.c | |
| parent | 08e46d1fd595ff2b9cb385169d90601c8b37fbf4 (diff) | |
| parent | e5e69970a1b906c5b77c200e38c943b61a498315 (diff) | |
| download | tcl-930a43ed48071b5047e9095dbf45408a3a82daca.zip tcl-930a43ed48071b5047e9095dbf45408a3a82daca.tar.gz tcl-930a43ed48071b5047e9095dbf45408a3a82daca.tar.bz2 | |
Merge 8.7
Diffstat (limited to 'unix/tclUnixSock.c')
| -rw-r--r-- | unix/tclUnixSock.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/unix/tclUnixSock.c b/unix/tclUnixSock.c index f81d323..f579991 100644 --- a/unix/tclUnixSock.c +++ b/unix/tclUnixSock.c @@ -23,7 +23,7 @@ /* "sock" + a pointer in hex + \0 */ #define SOCK_CHAN_LENGTH (4 + sizeof(void *) * 2 + 1) -#define SOCK_TEMPLATE "sock%lx" +#define SOCK_TEMPLATE "sock%" TCL_Z_MODIFIER "x" #undef SOCKET /* Possible conflict with win32 SOCKET */ @@ -1448,7 +1448,7 @@ Tcl_OpenTcpClient( return NULL; } - sprintf(channelName, SOCK_TEMPLATE, (long) statePtr); + sprintf(channelName, SOCK_TEMPLATE, PTR2INT(statePtr)); statePtr->channel = Tcl_CreateChannel(&tcpChannelType, channelName, statePtr, TCL_READABLE | TCL_WRITABLE); @@ -1515,7 +1515,7 @@ TclpMakeTcpClientChannelMode( statePtr->fds.fd = PTR2INT(sock); statePtr->flags = 0; - sprintf(channelName, SOCK_TEMPLATE, (long)statePtr); + sprintf(channelName, SOCK_TEMPLATE, PTR2INT(statePtr)); statePtr->channel = Tcl_CreateChannel(&tcpChannelType, channelName, statePtr, mode); @@ -1737,7 +1737,7 @@ Tcl_OpenTcpServerEx( memset(statePtr, 0, sizeof(TcpState)); statePtr->acceptProc = acceptProc; statePtr->acceptProcData = acceptProcData; - sprintf(channelName, SOCK_TEMPLATE, (long) statePtr); + sprintf(channelName, SOCK_TEMPLATE, PTR2INT(statePtr)); newfds = &statePtr->fds; } else { newfds = (TcpFdList *)Tcl_Alloc(sizeof(TcpFdList)); @@ -1829,7 +1829,7 @@ TcpAccept( newSockState->flags = 0; newSockState->fds.fd = newsock; - sprintf(channelName, SOCK_TEMPLATE, (long) newSockState); + sprintf(channelName, SOCK_TEMPLATE, PTR2INT(newSockState)); newSockState->channel = Tcl_CreateChannel(&tcpChannelType, channelName, newSockState, TCL_READABLE | TCL_WRITABLE); |