summaryrefslogtreecommitdiffstats
path: root/unix
diff options
context:
space:
mode:
authorsebres <sebres@users.sourceforge.net>2017-03-06 20:18:35 (GMT)
committersebres <sebres@users.sourceforge.net>2017-03-06 20:18:35 (GMT)
commit9f13ce8038e4c27cab5d0ee977a61ca48bde2b73 (patch)
tree2c581478c211e56c314bcaaeef4a690e7da31ed7 /unix
parentc88fb138612db4499a9e841453cd14bfd5db7224 (diff)
parentae0c48521551ffe6af28967e0c3b848836fb632e (diff)
downloadtcl-9f13ce8038e4c27cab5d0ee977a61ca48bde2b73.zip
tcl-9f13ce8038e4c27cab5d0ee977a61ca48bde2b73.tar.gz
tcl-9f13ce8038e4c27cab5d0ee977a61ca48bde2b73.tar.bz2
merge trunk
Diffstat (limited to 'unix')
-rwxr-xr-xunix/configure2
-rw-r--r--unix/tcl.m42
-rw-r--r--unix/tclUnixSock.c2
-rw-r--r--unix/tclUnixThrd.c2
4 files changed, 3 insertions, 5 deletions
diff --git a/unix/configure b/unix/configure
index baea1f1..741ae47 100755
--- a/unix/configure
+++ b/unix/configure
@@ -4985,7 +4985,7 @@ fi
if test "$GCC" = yes; then :
CFLAGS_OPTIMIZE=-O2
- CFLAGS_WARNING="-Wall -Wsign-compare -Wdeclaration-after-statement"
+ CFLAGS_WARNING="-Wall -Wwrite-strings -Wsign-compare -Wdeclaration-after-statement"
else
diff --git a/unix/tcl.m4 b/unix/tcl.m4
index 3189960..c1d7a7d 100644
--- a/unix/tcl.m4
+++ b/unix/tcl.m4
@@ -1096,7 +1096,7 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
CFLAGS_DEBUG=-g
AS_IF([test "$GCC" = yes], [
CFLAGS_OPTIMIZE=-O2
- CFLAGS_WARNING="-Wall -Wsign-compare -Wdeclaration-after-statement"
+ CFLAGS_WARNING="-Wall -Wwrite-strings -Wsign-compare -Wdeclaration-after-statement"
], [
CFLAGS_OPTIMIZE=-O
CFLAGS_WARNING=""
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