diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-07-08 10:34:57 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-07-08 10:34:57 (GMT) |
| commit | 38cfc0dc1366ca379dae1e0b46b49c953362b043 (patch) | |
| tree | b13769b0047671d6f58be1d66cc3fa9aa3c130b9 | |
| parent | a54ec2aacbcefc9937f752af4178841cc53e9d25 (diff) | |
| parent | 5861e21598de0fa797735436c93a90ca3b32bc24 (diff) | |
| download | tcl-38cfc0dc1366ca379dae1e0b46b49c953362b043.zip tcl-38cfc0dc1366ca379dae1e0b46b49c953362b043.tar.gz tcl-38cfc0dc1366ca379dae1e0b46b49c953362b043.tar.bz2 | |
MSVC 6.0 does not have the %I modifier
| -rw-r--r-- | win/tclWinInt.h | 6 | ||||
| -rw-r--r-- | win/tclWinSock.c | 8 |
2 files changed, 10 insertions, 4 deletions
diff --git a/win/tclWinInt.h b/win/tclWinInt.h index 882b811..22ad8e9 100644 --- a/win/tclWinInt.h +++ b/win/tclWinInt.h @@ -33,6 +33,12 @@ # define TCL_I_MODIFIER "" #endif +#ifdef _WIN64 +# define TCL_I_MODIFIER "I" +#else +# define TCL_I_MODIFIER "" +#endif + /* * Declarations of functions that are not accessible by way of the * stubs table. diff --git a/win/tclWinSock.c b/win/tclWinSock.c index ca49d22..9b181a6 100644 --- a/win/tclWinSock.c +++ b/win/tclWinSock.c @@ -1403,7 +1403,7 @@ Tcl_OpenTcpClient( return NULL; } - sprintf(channelName, "sock%Id", (size_t) infoPtr->sockets->fd); + sprintf(channelName, "sock%" TCL_I_MODIFIER "u", (size_t) infoPtr->sockets->fd); infoPtr->channel = Tcl_CreateChannel(&tcpChannelType, channelName, infoPtr, (TCL_READABLE | TCL_WRITABLE)); @@ -1466,7 +1466,7 @@ Tcl_MakeTcpClientChannel( infoPtr->selectEvents = FD_READ | FD_CLOSE | FD_WRITE; SendMessage(tsdPtr->hwnd, SOCKET_SELECT, (WPARAM)SELECT, (LPARAM)infoPtr); - sprintf(channelName, "sock%Id", (size_t) infoPtr->sockets->fd); + sprintf(channelName, "sock%" TCL_I_MODIFIER "u", (size_t) infoPtr->sockets->fd); infoPtr->channel = Tcl_CreateChannel(&tcpChannelType, channelName, infoPtr, (TCL_READABLE | TCL_WRITABLE)); Tcl_SetChannelOption(NULL, infoPtr->channel, "-translation", "auto crlf"); @@ -1519,7 +1519,7 @@ Tcl_OpenTcpServer( infoPtr->acceptProc = acceptProc; infoPtr->acceptProcData = acceptProcData; - sprintf(channelName, "sock%Id", (size_t) infoPtr->sockets->fd); + sprintf(channelName, "sock%" TCL_I_MODIFIER "u", (size_t) infoPtr->sockets->fd); infoPtr->channel = Tcl_CreateChannel(&tcpChannelType, channelName, infoPtr, 0); @@ -1625,7 +1625,7 @@ TcpAccept( SendMessage(tsdPtr->hwnd, SOCKET_SELECT, (WPARAM) SELECT, (LPARAM) newInfoPtr); - sprintf(channelName, "sock%Id", (size_t) newInfoPtr->sockets->fd); + sprintf(channelName, "sock%" TCL_I_MODIFIER "u", (size_t) newInfoPtr->sockets->fd); newInfoPtr->channel = Tcl_CreateChannel(&tcpChannelType, channelName, newInfoPtr, (TCL_READABLE | TCL_WRITABLE)); if (Tcl_SetChannelOption(NULL, newInfoPtr->channel, "-translation", |