diff options
| author | jan.nijtmans <jan.nijtmans@noemail.net> | 2013-02-22 09:30:20 (GMT) |
|---|---|---|
| committer | jan.nijtmans <jan.nijtmans@noemail.net> | 2013-02-22 09:30:20 (GMT) |
| commit | 3019b3eb10076305b51598b7108aaa39d6e68bc0 (patch) | |
| tree | d258ed112e5fe99ca61ac350ee668f96b9492ca0 | |
| parent | 576288f446b6711ed7247c4bc64af581a4f29388 (diff) | |
| download | tk-3019b3eb10076305b51598b7108aaa39d6e68bc0.zip tk-3019b3eb10076305b51598b7108aaa39d6e68bc0.tar.gz tk-3019b3eb10076305b51598b7108aaa39d6e68bc0.tar.bz2 | |
Make sure the stubbed variants of Tcl_ObjSetVar2/Tcl_NewStringObj are never used in winMain.c/tkAppInit.c
FossilOrigin-Name: 34f2a92b65bcf86a75d48a3b6687b32372cf218c
| -rw-r--r-- | unix/tkAppInit.c | 6 | ||||
| -rw-r--r-- | win/winMain.c | 6 |
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; } |