summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornijtmans <nijtmans>2008-10-07 21:24:43 (GMT)
committernijtmans <nijtmans>2008-10-07 21:24:43 (GMT)
commit094983988742832968355fbb8724e2f1f75059c8 (patch)
tree79e38af1a1e689dbaa6b50beb4a2f13050ab9ea2
parente495d8b0af42751258fbfd1c1b0e55cebc6c2dab (diff)
downloadtcl-094983988742832968355fbb8724e2f1f75059c8.zip
tcl-094983988742832968355fbb8724e2f1f75059c8.tar.gz
tcl-094983988742832968355fbb8724e2f1f75059c8.tar.bz2
undo "fix warnings from 2008-10-05 constification" (tclExecute.c 1.414), but
in stead modify two macro's in tclCompile.h with the same affect, but now without polluting C-code with type casts.
-rw-r--r--generic/tclCompile.h6
-rw-r--r--generic/tclExecute.c10
2 files changed, 8 insertions, 8 deletions
diff --git a/generic/tclCompile.h b/generic/tclCompile.h
index f314937..ac4990e 100644
--- a/generic/tclCompile.h
+++ b/generic/tclCompile.h
@@ -9,7 +9,7 @@
* See the file "license.terms" for information on usage and redistribution of
* this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclCompile.h,v 1.108 2008/10/05 20:47:52 nijtmans Exp $
+ * RCS: @(#) $Id: tclCompile.h,v 1.109 2008/10/07 21:24:43 nijtmans Exp $
*/
#ifndef _TCLCOMPILATION
@@ -1285,8 +1285,8 @@ MODULE_SCOPE int TclWordKnownAtCompileTime(Tcl_Token *tokenPtr,
#define TCL_DTRACE_INST_START_ENABLED() unlikely(TCL_INST_START_ENABLED())
#define TCL_DTRACE_INST_DONE_ENABLED() unlikely(TCL_INST_DONE_ENABLED())
-#define TCL_DTRACE_INST_START(a0, a1, a2) TCL_INST_START(a0, a1, a2)
-#define TCL_DTRACE_INST_DONE(a0, a1, a2) TCL_INST_DONE(a0, a1, a2)
+#define TCL_DTRACE_INST_START(a0, a1, a2) TCL_INST_START((char *)a0, a1, a2)
+#define TCL_DTRACE_INST_DONE(a0, a1, a2) TCL_INST_DONE((char *)a0, a1, a2)
#define TCL_DTRACE_TCL_PROBE_ENABLED() unlikely(TCL_TCL_PROBE_ENABLED())
#define TCL_DTRACE_TCL_PROBE(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9) \
diff --git a/generic/tclExecute.c b/generic/tclExecute.c
index a8c55fa..c6bce03 100644
--- a/generic/tclExecute.c
+++ b/generic/tclExecute.c
@@ -14,7 +14,7 @@
* See the file "license.terms" for information on usage and redistribution of
* this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclExecute.c,v 1.414 2008/10/07 01:15:34 das Exp $
+ * RCS: @(#) $Id: tclExecute.c,v 1.415 2008/10/07 21:24:43 nijtmans Exp $
*/
#include "tclInt.h"
@@ -391,21 +391,21 @@ VarHashCreateVar(
#define TCL_DTRACE_INST_NEXT() \
if (TCL_DTRACE_INST_DONE_ENABLED()) {\
if (curInstName) {\
- TCL_DTRACE_INST_DONE((char* ) curInstName, (int) CURR_DEPTH,\
+ TCL_DTRACE_INST_DONE(curInstName, (int) CURR_DEPTH,\
tosPtr);\
}\
curInstName = tclInstructionTable[*pc].name;\
if (TCL_DTRACE_INST_START_ENABLED()) {\
- TCL_DTRACE_INST_START((char*) curInstName, (int) CURR_DEPTH,\
+ TCL_DTRACE_INST_START(curInstName, (int) CURR_DEPTH,\
tosPtr);\
}\
} else if (TCL_DTRACE_INST_START_ENABLED()) {\
- TCL_DTRACE_INST_START((char*) tclInstructionTable[*pc].name,\
+ TCL_DTRACE_INST_START(tclInstructionTable[*pc].name,\
(int) CURR_DEPTH, tosPtr);\
}
#define TCL_DTRACE_INST_LAST() \
if (TCL_DTRACE_INST_DONE_ENABLED() && curInstName) {\
- TCL_DTRACE_INST_DONE((char*) curInstName, (int) CURR_DEPTH, tosPtr);\
+ TCL_DTRACE_INST_DONE(curInstName, (int) CURR_DEPTH, tosPtr);\
}
/*