summaryrefslogtreecommitdiffstats
path: root/unix/tclUnixSock.c
diff options
context:
space:
mode:
authordkf <donal.k.fellows@manchester.ac.uk>2013-01-28 00:57:04 (GMT)
committerdkf <donal.k.fellows@manchester.ac.uk>2013-01-28 00:57:04 (GMT)
commit174560be0971d7eddc16bd56fd6d578186143bac (patch)
treeddc0546dab10c8bc2575020750fc67d405b7b617 /unix/tclUnixSock.c
parent6f6055670dd0d873ec34dcd23ae9f8e282fe60aa (diff)
parent2ea70632bbcf5060e5114653d4717480c03c0cee (diff)
downloadtcl-174560be0971d7eddc16bd56fd6d578186143bac.zip
tcl-174560be0971d7eddc16bd56fd6d578186143bac.tar.gz
tcl-174560be0971d7eddc16bd56fd6d578186143bac.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. */
{