summaryrefslogtreecommitdiffstats
path: root/generic
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2019-08-02 12:45:54 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2019-08-02 12:45:54 (GMT)
commit96906cee5e0ea778956e526b49b8b0b6c2f8f192 (patch)
tree857718f2c70893ad7410c2f6fa9b2dbe068c3f79 /generic
parent0756701c6049945aae2eed978d7c60cd981eca80 (diff)
downloadtcl-96906cee5e0ea778956e526b49b8b0b6c2f8f192.zip
tcl-96906cee5e0ea778956e526b49b8b0b6c2f8f192.tar.gz
tcl-96906cee5e0ea778956e526b49b8b0b6c2f8f192.tar.bz2
Add one more knownMsvcBug marker, for a test-case which sometimes fails in Travis.
Fix a struct initializer, add two typecasts and a "const", which can generate gcc warnings with some compiler options.
Diffstat (limited to 'generic')
-rw-r--r--generic/tclCmdMZ.c2
-rw-r--r--generic/tclEnv.c3
-rw-r--r--generic/tclStubLib.c2
3 files changed, 4 insertions, 3 deletions
diff --git a/generic/tclCmdMZ.c b/generic/tclCmdMZ.c
index 1cb27fc..ae10e74 100644
--- a/generic/tclCmdMZ.c
+++ b/generic/tclCmdMZ.c
@@ -2720,7 +2720,7 @@ TclStringCmp(
int reqlength) /* requested length; -1 to compare whole
* strings */
{
- char *s1, *s2;
+ const char *s1, *s2;
int empty, length, match, s1len, s2len;
memCmpFn_t memCmpFn;
diff --git a/generic/tclEnv.c b/generic/tclEnv.c
index b001153..da05f93 100644
--- a/generic/tclEnv.c
+++ b/generic/tclEnv.c
@@ -119,7 +119,8 @@ TclSetupEnv(
Tcl_MutexLock(&envMutex);
for (i = 0; environ[i] != NULL; i++) {
Tcl_Obj *obj1, *obj2;
- char *p1, *p2;
+ const char *p1;
+ char *p2;
p1 = Tcl_ExternalToUtfDString(NULL, environ[i], -1, &envString);
p2 = strchr(p1, '=');
diff --git a/generic/tclStubLib.c b/generic/tclStubLib.c
index 859cbf9..bebea81 100644
--- a/generic/tclStubLib.c
+++ b/generic/tclStubLib.c
@@ -68,7 +68,7 @@ Tcl_InitStubs(
*/
if (!stubsPtr || (stubsPtr->magic != TCL_STUB_MAGIC)) {
- iPtr->result = "interpreter uses an incompatible stubs mechanism";
+ iPtr->result = (char *)"interpreter uses an incompatible stubs mechanism";
iPtr->freeProc = TCL_STATIC;
return NULL;
}