diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2013-02-19 13:21:53 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2013-02-19 13:21:53 (GMT) |
| commit | 9279b3aad8ae6175e5238ffd10a05652a2f56c93 (patch) | |
| tree | 955c6b8b15d8417069cb3dee3fec6de247795f4e /unix | |
| parent | 9d856256a392f919a13d4dc2171dcbdf4c39e31c (diff) | |
| parent | 3eafe75fbc925da366e32a959d479a254ebfc02a (diff) | |
| download | tcl-9279b3aad8ae6175e5238ffd10a05652a2f56c93.zip tcl-9279b3aad8ae6175e5238ffd10a05652a2f56c93.tar.gz tcl-9279b3aad8ae6175e5238ffd10a05652a2f56c93.tar.bz2 | |
Merge trunk.
Tranform Tcl_SaveResult/Tcl_RestoreResult/Tcl_DiscardResult to macros, and remove them from the stub table
Diffstat (limited to 'unix')
| -rw-r--r-- | unix/tclAppInit.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/unix/tclAppInit.c b/unix/tclAppInit.c index 21dce71..f3edcff 100644 --- a/unix/tclAppInit.c +++ b/unix/tclAppInit.c @@ -48,7 +48,7 @@ MODULE_SCOPE int main(int, char **); */ #ifdef TCL_LOCAL_MAIN_HOOK -extern int TCL_LOCAL_MAIN_HOOK(int *argc, char ***argv); +MODULE_SCOPE int TCL_LOCAL_MAIN_HOOK(int *argc, char ***argv); #endif /* @@ -150,9 +150,11 @@ Tcl_AppInit( */ #ifdef DJGPP - (Tcl_SetVar2)(interp, "tcl_rcFileName", NULL, "~/tclsh.rc", TCL_GLOBAL_ONLY); + (Tcl_ObjSetVar2)(interp, Tcl_NewStringObj("tcl_rcFileName", -1), NULL, + Tcl_NewStringObj("~/tclsh.rc", -1), TCL_GLOBAL_ONLY); #else - (Tcl_SetVar2)(interp, "tcl_rcFileName", NULL, "~/.tclshrc", TCL_GLOBAL_ONLY); + (Tcl_ObjSetVar2)(interp, Tcl_NewStringObj("tcl_rcFileName", -1), NULL, + Tcl_NewStringObj("~/.tclshrc", -1), TCL_GLOBAL_ONLY); #endif return TCL_OK; |