summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2017-03-21 09:01:09 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2017-03-21 09:01:09 (GMT)
commitfb164d154e19967aeac890d717cb0fc514274e49 (patch)
tree501d6e304a10a466094ff238e5ea4a5faaef8b96
parentf428406cb110cc296fb78528d244808d60316584 (diff)
downloadtcl-fb164d154e19967aeac890d717cb0fc514274e49.zip
tcl-fb164d154e19967aeac890d717cb0fc514274e49.tar.gz
tcl-fb164d154e19967aeac890d717cb0fc514274e49.tar.bz2
Addendum to previous commit: If compiled with TCL_NO_DEPRECATED, remove a few more stub entries which are not used any more.
-rw-r--r--generic/tclStubInit.c8
-rw-r--r--generic/tclTrace.c6
-rw-r--r--generic/tclVar.c2
3 files changed, 16 insertions, 0 deletions
diff --git a/generic/tclStubInit.c b/generic/tclStubInit.c
index 50fac4b..7957389 100644
--- a/generic/tclStubInit.c
+++ b/generic/tclStubInit.c
@@ -323,6 +323,14 @@ static int formatInt(char *buffer, int n){
# define Tcl_UnsetVar 0
# undef Tcl_GetVar
# define Tcl_GetVar 0
+# undef Tcl_TraceVar
+# define Tcl_TraceVar 0
+# undef Tcl_UntraceVar
+# define Tcl_UntraceVar 0
+# undef Tcl_VarTraceInfo
+# define Tcl_VarTraceInfo 0
+# undef Tcl_UpVar
+# define Tcl_UpVar 0
# undef Tcl_AddErrorInfo
# define Tcl_AddErrorInfo 0
# undef Tcl_AddObjErrorInfo
diff --git a/generic/tclTrace.c b/generic/tclTrace.c
index bea3162..f86f472 100644
--- a/generic/tclTrace.c
+++ b/generic/tclTrace.c
@@ -2819,6 +2819,7 @@ DisposeTraceResult(
*----------------------------------------------------------------------
*/
+#ifndef TCL_NO_DEPRECATED
#undef Tcl_UntraceVar
void
Tcl_UntraceVar(
@@ -2834,6 +2835,7 @@ Tcl_UntraceVar(
{
Tcl_UntraceVar2(interp, varName, NULL, flags, proc, clientData);
}
+#endif /* TCL_NO_DEPRECATED */
/*
*----------------------------------------------------------------------
@@ -2988,6 +2990,7 @@ Tcl_UntraceVar2(
*----------------------------------------------------------------------
*/
+#ifndef TCL_NO_DEPRECATED
#undef Tcl_VarTraceInfo
ClientData
Tcl_VarTraceInfo(
@@ -3005,6 +3008,7 @@ Tcl_VarTraceInfo(
return Tcl_VarTraceInfo2(interp, varName, NULL, flags, proc,
prevClientData);
}
+#endif /* TCL_NO_DEPRECATED */
/*
*----------------------------------------------------------------------
@@ -3097,6 +3101,7 @@ Tcl_VarTraceInfo2(
*----------------------------------------------------------------------
*/
+#ifndef TCL_NO_DEPRECATED
#undef Tcl_TraceVar
int
Tcl_TraceVar(
@@ -3114,6 +3119,7 @@ Tcl_TraceVar(
{
return Tcl_TraceVar2(interp, varName, NULL, flags, proc, clientData);
}
+#endif /* TCL_NO_DEPRECATED */
/*
*----------------------------------------------------------------------
diff --git a/generic/tclVar.c b/generic/tclVar.c
index 6090d61..1947c8d 100644
--- a/generic/tclVar.c
+++ b/generic/tclVar.c
@@ -4322,6 +4322,7 @@ TclPtrObjMakeUpvar(
*----------------------------------------------------------------------
*/
+#ifndef TCL_NO_DEPRECATED
#undef Tcl_UpVar
int
Tcl_UpVar(
@@ -4355,6 +4356,7 @@ Tcl_UpVar(
Tcl_DecrRefCount(localNamePtr);
return result;
}
+#endif /* TCL_NO_DEPRECATED */
/*
*----------------------------------------------------------------------