summaryrefslogtreecommitdiffstats
path: root/generic/tclBasic.c
diff options
context:
space:
mode:
authormig <mig>2013-05-07 18:08:41 (GMT)
committermig <mig>2013-05-07 18:08:41 (GMT)
commit4b77e57edee60a93344391d16de7eeddb3e452cb (patch)
treec00b8bdc66e031faacc20c76d9a17df6a62832c5 /generic/tclBasic.c
parent5e64cfb104de3edbed8962d00743912eff6cb430 (diff)
parentebbffb3ea5b1b5609e3fb86ddea543aa3d24693d (diff)
downloadtcl-mig_no280.zip
tcl-mig_no280.tar.gz
tcl-mig_no280.tar.bz2
merge trunkmig_no280
Diffstat (limited to 'generic/tclBasic.c')
-rw-r--r--generic/tclBasic.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/generic/tclBasic.c b/generic/tclBasic.c
index 7783552..5a3347e 100644
--- a/generic/tclBasic.c
+++ b/generic/tclBasic.c
@@ -5101,6 +5101,7 @@ Tcl_Eval(
*----------------------------------------------------------------------
*/
+#undef Tcl_EvalObj
int
Tcl_EvalObj(
Tcl_Interp *interp,
@@ -5108,6 +5109,7 @@ Tcl_EvalObj(
{
return Tcl_EvalObjEx(interp, objPtr, 0);
}
+#undef Tcl_GlobalEvalObj
int
Tcl_GlobalEvalObj(
Tcl_Interp *interp,
@@ -5822,6 +5824,7 @@ Tcl_ExprString(
*----------------------------------------------------------------------
*/
+#undef Tcl_AddObjErrorInfo
void
Tcl_AppendObjToErrorInfo(
Tcl_Interp *interp, /* Interpreter to which error information
@@ -5886,7 +5889,6 @@ Tcl_AddErrorInfo(
*----------------------------------------------------------------------
*/
-#undef Tcl_AddObjErrorInfo
void
Tcl_AddObjErrorInfo(
Tcl_Interp *interp, /* Interpreter to which error information
@@ -6556,7 +6558,7 @@ ExprAbsFunc(
return TCL_OK;
}
-#ifndef NO_WIDE_TYPE
+#ifndef TCL_WIDE_INT_IS_LONG
if (type == TCL_NUMBER_WIDE) {
Tcl_WideInt w = *((const Tcl_WideInt *) ptr);