summaryrefslogtreecommitdiffstats
path: root/generic/tclResult.c
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2019-05-09 20:06:34 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2019-05-09 20:06:34 (GMT)
commitb1139d3d2099aad8ad1981deaa0f689e1b4c322a (patch)
tree9dc5cc17a2906df1e6ea7a295b0293b5cfd80681 /generic/tclResult.c
parent67ba502f3489051889064fbb4b3b66741704d254 (diff)
downloadtcl-b1139d3d2099aad8ad1981deaa0f689e1b4c322a.zip
tcl-b1139d3d2099aad8ad1981deaa0f689e1b4c322a.tar.gz
tcl-b1139d3d2099aad8ad1981deaa0f689e1b4c322a.tar.bz2
If compiling with -DTCL_NO_DEPRECATED, make Tcl_GetStringResult() a macro. This opens up one more simplification for Tcl 9.
Compile the load-test dll's/so's with -DTCL_NO_DEPRECATED
Diffstat (limited to 'generic/tclResult.c')
-rw-r--r--generic/tclResult.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/generic/tclResult.c b/generic/tclResult.c
index 5a03421..4d14f01 100644
--- a/generic/tclResult.c
+++ b/generic/tclResult.c
@@ -464,7 +464,6 @@ Tcl_SetResult(
ResetObjResult(iPtr);
}
-#endif /* !TCL_NO_DEPRECATED */
/*
*----------------------------------------------------------------------
@@ -488,9 +487,6 @@ Tcl_GetStringResult(
register Tcl_Interp *interp)/* Interpreter whose result to return. */
{
Interp *iPtr = (Interp *) interp;
-#ifdef TCL_NO_DEPRECATED
- return Tcl_GetString(iPtr->objResultPtr);
-#else
/*
* If the string result is empty, move the object result to the string
* result, then reset the object result.
@@ -501,8 +497,8 @@ Tcl_GetStringResult(
TCL_VOLATILE);
}
return iPtr->result;
-#endif
}
+#endif /* !TCL_NO_DEPRECATED */
/*
*----------------------------------------------------------------------