diff options
| author | dkf <donal.k.fellows@manchester.ac.uk> | 2013-01-16 14:16:34 (GMT) |
|---|---|---|
| committer | dkf <donal.k.fellows@manchester.ac.uk> | 2013-01-16 14:16:34 (GMT) |
| commit | 9843ac2a949950a8dd51bcba03fbdfcb71d0e48f (patch) | |
| tree | 4efb09d21a52695b78db8cfc0841a372283602c2 /unix | |
| parent | 8d1982bdd791d4454a5e3f8928b5936b869b0d43 (diff) | |
| parent | 445ffe85310c4a5853d313305b11a4323605c29c (diff) | |
| download | tcl-9843ac2a949950a8dd51bcba03fbdfcb71d0e48f.zip tcl-9843ac2a949950a8dd51bcba03fbdfcb71d0e48f.tar.gz tcl-9843ac2a949950a8dd51bcba03fbdfcb71d0e48f.tar.bz2 | |
merge trunk
Diffstat (limited to 'unix')
| -rw-r--r-- | unix/tclUnixPort.h | 6 | ||||
| -rw-r--r-- | unix/tclUnixSock.c | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/unix/tclUnixPort.h b/unix/tclUnixPort.h index 63c500d..88cc87e 100644 --- a/unix/tclUnixPort.h +++ b/unix/tclUnixPort.h @@ -319,7 +319,7 @@ MODULE_SCOPE int TclUnixSetBlockingMode(int fd, int mode); #endif #ifdef GETTOD_NOT_DECLARED -MODULE_SCOPE int gettimeofday(struct timeval *tp, +extern int gettimeofday(struct timeval *tp, struct timezone *tzp); #endif @@ -744,8 +744,8 @@ MODULE_SCOPE struct group * TclpGetGrGid(gid_t gid); MODULE_SCOPE struct hostent * TclpGetHostByName(const char *name); MODULE_SCOPE struct hostent * TclpGetHostByAddr(const char *addr, int length, int type); -MODULE_SCOPE Tcl_Channel TclpMakeTcpClientChannelMode( - ClientData tcpSocket, int mode); +MODULE_SCOPE void *TclpMakeTcpClientChannelMode( + void *tcpSocket, int mode); #endif /* _TCLUNIXPORT */ 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. */ { |