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 | |
| 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*'.
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | generic/tclAssembly.c | 4 | ||||
| -rw-r--r-- | generic/tclTest.c | 2 |
3 files changed, 14 insertions, 3 deletions
@@ -1,3 +1,14 @@ +2011-03-14 Kevin B. Kenny <kennykb@acm.org> + + * 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*'. + 2011-03-13 Miguel Sofer <msofer@users.sf.net> * generic/tclExecute.c: remove TEBCreturn() diff --git a/generic/tclAssembly.c b/generic/tclAssembly.c index 45756eb..754941f 100644 --- a/generic/tclAssembly.c +++ b/generic/tclAssembly.c @@ -241,7 +241,7 @@ static void BBAdjustStackDepth(BasicBlock* bbPtr, int consumed, static void BBUpdateStackReqs(BasicBlock* bbPtr, int tblIdx, int count); static void BBEmitInstInt1(AssemblyEnv* assemEnvPtr, int tblIdx, - unsigned char opnd, int count); + int opnd, int count); static void BBEmitInstInt4(AssemblyEnv* assemEnvPtr, int tblIdx, int opnd, int count); static void BBEmitInst1or4(AssemblyEnv* assemEnvPtr, int tblIdx, @@ -652,7 +652,7 @@ static void BBEmitInstInt1( AssemblyEnv* assemEnvPtr, /* Assembly environment */ int tblIdx, /* Index in TalInstructionTable of op */ - unsigned char opnd, /* 1-byte operand */ + int opnd, /* 1-byte operand */ int count) /* Operand count for variadic ops */ { BBEmitOpcode(assemEnvPtr, tblIdx, count); 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 { |