summaryrefslogtreecommitdiffstats
path: root/unix/tclUnixSock.c
diff options
context:
space:
mode:
authordonal.k.fellows@manchester.ac.uk <dkf>2013-11-19 13:02:05 (GMT)
committerdonal.k.fellows@manchester.ac.uk <dkf>2013-11-19 13:02:05 (GMT)
commit927d98cab8f8cacf83e56543eabcd38fb2ecdae8 (patch)
treec1d1a1ad7d27af149a257ef0eba6b35dea1f5057 /unix/tclUnixSock.c
parentfcf4c53ed773b5afb0ccb2517c5a3ba6ea45dc67 (diff)
parent0c64716c131bbc1609b9b539eab58b677b8ec8bc (diff)
downloadtcl-927d98cab8f8cacf83e56543eabcd38fb2ecdae8.zip
tcl-927d98cab8f8cacf83e56543eabcd38fb2ecdae8.tar.gz
tcl-927d98cab8f8cacf83e56543eabcd38fb2ecdae8.tar.bz2
merge trunk
Diffstat (limited to 'unix/tclUnixSock.c')
-rw-r--r--unix/tclUnixSock.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/unix/tclUnixSock.c b/unix/tclUnixSock.c
index 7ef28d8..49a6460 100644
--- a/unix/tclUnixSock.c
+++ b/unix/tclUnixSock.c
@@ -1140,7 +1140,7 @@ Tcl_OpenTcpClient(
{
TcpState *state;
const char *errorMsg = NULL;
- void *addrlist = NULL, *myaddrlist = NULL;
+ struct addrinfo *addrlist = NULL, *myaddrlist = NULL;
char channelName[SOCK_CHAN_LENGTH];
/*
@@ -1285,8 +1285,7 @@ Tcl_OpenTcpServer(
ClientData acceptProcData) /* Data for the callback. */
{
int status = 0, sock = -1, reuseaddr = 1, chosenport = 0;
- void *addrlist = NULL;
- struct addrinfo *addrPtr; /* socket address */
+ struct addrinfo *addrlist = NULL, *addrPtr; /* socket address */
TcpState *statePtr = NULL;
char channelName[SOCK_CHAN_LENGTH];
const char *errorMsg = NULL;