diff options
| author | dgp <dgp@users.sourceforge.net> | 2016-06-16 15:19:41 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2016-06-16 15:19:41 (GMT) |
| commit | dd519c7dac7bb193e0eccc06e9e33a378f7d37b6 (patch) | |
| tree | f824e5fe9e245730af806b3a5aabf69b2c8e1e08 /unix/tclUnixSock.c | |
| parent | f67a341fce27e0e6c8de7ec44c78e7ea0e16c3bd (diff) | |
| parent | 4d6aaa2e8b970c7babd8047939266ccc21084c7e (diff) | |
| download | tcl-dd519c7dac7bb193e0eccc06e9e33a378f7d37b6.zip tcl-dd519c7dac7bb193e0eccc06e9e33a378f7d37b6.tar.gz tcl-dd519c7dac7bb193e0eccc06e9e33a378f7d37b6.tar.bz2 | |
Merge up to a197e6853e. Still works. Next checkin restarts the segfaults.
Diffstat (limited to 'unix/tclUnixSock.c')
| -rw-r--r-- | unix/tclUnixSock.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/unix/tclUnixSock.c b/unix/tclUnixSock.c index 31daa62..9c3d7eb 100644 --- a/unix/tclUnixSock.c +++ b/unix/tclUnixSock.c @@ -1131,7 +1131,7 @@ Tcl_OpenTcpClient( { TcpState *state; const char *errorMsg = NULL; - struct addrinfo *addrlist = NULL, *myaddrlist = NULL; + void *addrlist = NULL, *myaddrlist = NULL; char channelName[SOCK_CHAN_LENGTH]; /* @@ -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. */ { @@ -1276,7 +1276,8 @@ Tcl_OpenTcpServer( ClientData acceptProcData) /* Data for the callback. */ { int status = 0, sock = -1, reuseaddr = 1, chosenport = 0; - struct addrinfo *addrlist = NULL, *addrPtr; /* socket address */ + void *addrlist = NULL; + struct addrinfo *addrPtr; /* socket address */ TcpState *statePtr = NULL; char channelName[SOCK_CHAN_LENGTH]; const char *errorMsg = NULL; |