summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2013-02-22 09:30:20 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2013-02-22 09:30:20 (GMT)
commitfee86da1c91ba1bfae832ba669b288bb7bb7ddfc (patch)
treed258ed112e5fe99ca61ac350ee668f96b9492ca0
parentf584bb01ccf547af727096674302e8a6dbae1252 (diff)
downloadtk-fee86da1c91ba1bfae832ba669b288bb7bb7ddfc.zip
tk-fee86da1c91ba1bfae832ba669b288bb7bb7ddfc.tar.gz
tk-fee86da1c91ba1bfae832ba669b288bb7bb7ddfc.tar.bz2
Make sure the stubbed variants of Tcl_ObjSetVar2/Tcl_NewStringObj are never used in winMain.c/tkAppInit.c
-rw-r--r--unix/tkAppInit.c6
-rw-r--r--win/winMain.c6
2 files changed, 10 insertions, 2 deletions
diff --git a/unix/tkAppInit.c b/unix/tkAppInit.c
index b18179b..9a0b053 100644
--- a/unix/tkAppInit.c
+++ b/unix/tkAppInit.c
@@ -44,6 +44,10 @@ MODULE_SCOPE int main(int, char **);
#ifdef TK_LOCAL_MAIN_HOOK
MODULE_SCOPE int TK_LOCAL_MAIN_HOOK(int *argc, char ***argv);
#endif
+
+/* Make sure the stubbed variants of those are never used. */
+#undef Tcl_ObjSetVar2
+#undef Tcl_NewStringObj
/*
*----------------------------------------------------------------------
@@ -138,7 +142,7 @@ Tcl_AppInit(
* specific startup file will be run under any conditions.
*/
- (Tcl_ObjSetVar2)(interp, Tcl_NewStringObj("tcl_rcFileName", -1), NULL,
+ Tcl_ObjSetVar2(interp, Tcl_NewStringObj("tcl_rcFileName", -1), NULL,
Tcl_NewStringObj("~/.wishrc", -1), TCL_GLOBAL_ONLY);
return TCL_OK;
}
diff --git a/win/winMain.c b/win/winMain.c
index d245038..a7308cf 100644
--- a/win/winMain.c
+++ b/win/winMain.c
@@ -63,6 +63,10 @@ MODULE_SCOPE int TK_LOCAL_APPINIT(Tcl_Interp *interp);
#ifdef TK_LOCAL_MAIN_HOOK
MODULE_SCOPE int TK_LOCAL_MAIN_HOOK(int *argc, TCHAR ***argv);
#endif
+
+/* Make sure the stubbed variants of those are never used. */
+#undef Tcl_ObjSetVar2
+#undef Tcl_NewStringObj
/*
*----------------------------------------------------------------------
@@ -227,7 +231,7 @@ Tcl_AppInit(
* specific startup file will be run under any conditions.
*/
- (Tcl_ObjSetVar2)(interp, Tcl_NewStringObj("tcl_rcFileName", -1), NULL,
+ Tcl_ObjSetVar2(interp, Tcl_NewStringObj("tcl_rcFileName", -1), NULL,
Tcl_NewStringObj("~/wishrc.tcl", -1), TCL_GLOBAL_ONLY);
return TCL_OK;
}