summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2016-04-08 13:31:28 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2016-04-08 13:31:28 (GMT)
commitd2dabcff9ef28f0ea4fecce7d660d532f180d674 (patch)
treecb5dc8fa85746eab73c4dcfb4a8abb1fe9573004
parent5873cf9d02ba54be3b125ec73f3be74ea7f12db4 (diff)
parent9a27611f89f0e7b8a3a75faa7d1682a20aeb4d41 (diff)
downloadtcl-d2dabcff9ef28f0ea4fecce7d660d532f180d674.zip
tcl-d2dabcff9ef28f0ea4fecce7d660d532f180d674.tar.gz
tcl-d2dabcff9ef28f0ea4fecce7d660d532f180d674.tar.bz2
merge trunk
-rw-r--r--win/tclWinSock.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/win/tclWinSock.c b/win/tclWinSock.c
index c69581d..7ed96ea 100644
--- a/win/tclWinSock.c
+++ b/win/tclWinSock.c
@@ -2052,7 +2052,6 @@ Tcl_OpenTcpServer(
char channelName[SOCK_CHAN_LENGTH];
u_long flag = 1; /* Indicates nonblocking mode. */
const char *errorMsg = NULL;
- ThreadSpecificData *tsdPtr = TclThreadDataKeyGet(&dataKey);
if (TclpHasSockets(interp) != TCL_OK) {
return NULL;
@@ -2168,6 +2167,7 @@ error:
}
if (statePtr != NULL) {
+ ThreadSpecificData *tsdPtr = TclThreadDataKeyGet(&dataKey);
statePtr->acceptProc = acceptProc;
statePtr->acceptProcData = acceptProcData;