summaryrefslogtreecommitdiffstats
path: root/unix/tclUnixSock.c
diff options
context:
space:
mode:
authordkf <donal.k.fellows@manchester.ac.uk>2013-01-16 14:16:34 (GMT)
committerdkf <donal.k.fellows@manchester.ac.uk>2013-01-16 14:16:34 (GMT)
commit9843ac2a949950a8dd51bcba03fbdfcb71d0e48f (patch)
tree4efb09d21a52695b78db8cfc0841a372283602c2 /unix/tclUnixSock.c
parent8d1982bdd791d4454a5e3f8928b5936b869b0d43 (diff)
parent445ffe85310c4a5853d313305b11a4323605c29c (diff)
downloadtcl-9843ac2a949950a8dd51bcba03fbdfcb71d0e48f.zip
tcl-9843ac2a949950a8dd51bcba03fbdfcb71d0e48f.tar.gz
tcl-9843ac2a949950a8dd51bcba03fbdfcb71d0e48f.tar.bz2
merge trunk
Diffstat (limited to 'unix/tclUnixSock.c')
-rw-r--r--unix/tclUnixSock.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/unix/tclUnixSock.c b/unix/tclUnixSock.c
index 31daa62..528f009 100644
--- a/unix/tclUnixSock.c
+++ b/unix/tclUnixSock.c
@@ -1202,7 +1202,7 @@ Tcl_Channel
Tcl_MakeTcpClientChannel(
ClientData sock) /* The socket to wrap up into a channel. */
{
- return TclpMakeTcpClientChannelMode(sock, (TCL_READABLE | TCL_WRITABLE));
+ return (Tcl_Channel) TclpMakeTcpClientChannelMode(sock, (TCL_READABLE | TCL_WRITABLE));
}
/*
@@ -1222,9 +1222,9 @@ Tcl_MakeTcpClientChannel(
*----------------------------------------------------------------------
*/
-Tcl_Channel
+void *
TclpMakeTcpClientChannelMode(
- ClientData sock, /* The socket to wrap up into a channel. */
+ void *sock, /* The socket to wrap up into a channel. */
int mode) /* ORed combination of TCL_READABLE and
* TCL_WRITABLE to indicate file mode. */
{