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)
commitad788184e3e1b40db77aa4578ddea20e21b95cf8 (patch)
treee533d7a219281f35c1f76db707b49db9f39a6946 /unix
parent2bb76d85aab9e1e1bef4fca9498972a999d99569 (diff)
parent41646a22947a6d4838f7c10443925c3a78f5c7fe (diff)
downloadtcl-ad788184e3e1b40db77aa4578ddea20e21b95cf8.zip
tcl-ad788184e3e1b40db77aa4578ddea20e21b95cf8.tar.gz
tcl-ad788184e3e1b40db77aa4578ddea20e21b95cf8.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