summaryrefslogtreecommitdiffstats
path: root/unix
diff options
context:
space:
mode:
authorsebres <sebres@users.sourceforge.net>2017-03-06 20:19:39 (GMT)
committersebres <sebres@users.sourceforge.net>2017-03-06 20:19:39 (GMT)
commita307956de52eb22f4299959a93df2172b8a40b23 (patch)
treee533d7a219281f35c1f76db707b49db9f39a6946 /unix
parentd5c91a755cafe40630668464ed4e070fdd647852 (diff)
parentae0c48521551ffe6af28967e0c3b848836fb632e (diff)
downloadtcl-a307956de52eb22f4299959a93df2172b8a40b23.zip
tcl-a307956de52eb22f4299959a93df2172b8a40b23.tar.gz
tcl-a307956de52eb22f4299959a93df2172b8a40b23.tar.bz2
merge trunk
Diffstat (limited to 'unix')
-rw-r--r--unix/tclUnixSock.c2
-rw-r--r--unix/tclUnixThrd.c2
2 files changed, 1 insertions, 3 deletions
diff --git a/unix/tclUnixSock.c b/unix/tclUnixSock.c
index 8e97543..9387d05 100644
--- a/unix/tclUnixSock.c
+++ b/unix/tclUnixSock.c
@@ -240,7 +240,7 @@ InitializeHostName(
}
}
if (native == NULL) {
- native = tclEmptyStringRep;
+ native = &tclEmptyString;
}
#else /* !NO_UNAME */
/*
diff --git a/unix/tclUnixThrd.c b/unix/tclUnixThrd.c
index 7394545..805599d 100644
--- a/unix/tclUnixThrd.c
+++ b/unix/tclUnixThrd.c
@@ -711,9 +711,7 @@ TclpFreeAllocMutex(
void
TclpInitAllocCache(void)
{
- pthread_mutex_lock(allocLockPtr);
pthread_key_create(&key, NULL);
- pthread_mutex_unlock(allocLockPtr);
}
void