diff options
author | Kevin B Kenny <kennykb@acm.org> | 2011-03-13 22:42:24 (GMT) |
---|---|---|
committer | Kevin B Kenny <kennykb@acm.org> | 2011-03-13 22:42:24 (GMT) |
commit | 9c2e378362223c670fe77827649dbdca520715c8 (patch) | |
tree | 4f7d103c464bde929ac0961bcb9ee72be86a0261 /generic/tclTest.c | |
parent | 444dc1aa718c0939ea6a941227f67bb39535c044 (diff) | |
download | tcl-9c2e378362223c670fe77827649dbdca520715c8.zip tcl-9c2e378362223c670fe77827649dbdca520715c8.tar.gz tcl-9c2e378362223c670fe77827649dbdca520715c8.tar.bz2 |
* generic/tclAssembly.c (BBEmitInstInt1): Changed parameter
data types in an effort to silence a MSVC warning reported by
Ashok P. Nadkarni. Unable to test, since both forms work on
my machine in VC2005, 2008. 2010, in both release and debug
builds.
* tests/tclTest.c (TestdstringCmd): Restored MSVC buildability
broken by [5574bdd262], which changed the effective return type
of 'ckalloc' from 'char*' to 'void*'.
Diffstat (limited to 'generic/tclTest.c')
-rw-r--r-- | generic/tclTest.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/generic/tclTest.c b/generic/tclTest.c index 2e9a9e8..b757185 100644 --- a/generic/tclTest.c +++ b/generic/tclTest.c @@ -1767,7 +1767,7 @@ TestdstringCmd( strcpy(s, "This is a malloc-ed string"); Tcl_SetResult(interp, s, TCL_DYNAMIC); } else if (strcmp(argv[2], "special") == 0) { - char *s = ckalloc(100) + 16; + char *s = (char*)ckalloc(100) + 16; strcpy(s, "This is a specially-allocated string"); Tcl_SetResult(interp, s, SpecialFree); } else { |