summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2021-06-22 09:03:17 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2021-06-22 09:03:17 (GMT)
commit7403235131e07089b4bf7631bca905519592ca5b (patch)
tree41141da3fbf065b6d4c826d82fe862627c6a919b
parenta8e1d5aae33094f7efbd1e290797fcd5c0168522 (diff)
parent30db6ce78e7c4b96b977320e4d16555a93401c8d (diff)
downloadtcl-7403235131e07089b4bf7631bca905519592ca5b.zip
tcl-7403235131e07089b4bf7631bca905519592ca5b.tar.gz
tcl-7403235131e07089b4bf7631bca905519592ca5b.tar.bz2
Merge 8.5
-rw-r--r--win/nmakehlp.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/win/nmakehlp.c b/win/nmakehlp.c
index 7536ede..4021346 100644
--- a/win/nmakehlp.c
+++ b/win/nmakehlp.c
@@ -537,7 +537,7 @@ GetVersionFromFile(
++q;
}
- memcpy(szBuffer, p, q - p);
+ memmove(szBuffer, p, q - p);
szBuffer[q-p] = 0;
szResult = szBuffer;
break;
@@ -674,7 +674,7 @@ SubstituteFile(
memcpy(szBuffer, szCopy, sizeof(szCopy));
}
}
- printf(szBuffer);
+ printf("%s", szBuffer);
}
list_free(&substPtr);