diff options
| author | seandeelywoods <seandeelywoods> | 2013-03-18 12:41:14 (GMT) |
|---|---|---|
| committer | seandeelywoods <seandeelywoods> | 2013-03-18 12:41:14 (GMT) |
| commit | 87d0bd2b565cc904bdd135291c1baa5ff5cea4d5 (patch) | |
| tree | 63b370c68febf9ed24fc630644117cf735313b40 /win/tclAppInit.c | |
| parent | 3faa92fe264c5671bd8dad903cb13ca5ce302781 (diff) | |
| parent | 3fda4f0df6f0fdabe84372aee281ffb4ca7108e1 (diff) | |
| download | tcl-hypnotoad_bug_3598385.zip tcl-hypnotoad_bug_3598385.tar.gz tcl-hypnotoad_bug_3598385.tar.bz2 | |
Merging in changes from trunkhypnotoad_bug_3598385
Diffstat (limited to 'win/tclAppInit.c')
| -rw-r--r-- | win/tclAppInit.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/win/tclAppInit.c b/win/tclAppInit.c index 56f45a0..753eaff 100644 --- a/win/tclAppInit.c +++ b/win/tclAppInit.c @@ -45,7 +45,10 @@ static void setargv(int *argcPtr, TCHAR ***argvPtr); #ifndef TCL_LOCAL_APPINIT #define TCL_LOCAL_APPINIT Tcl_AppInit #endif -extern int TCL_LOCAL_APPINIT(Tcl_Interp *interp); +#ifndef MODULE_SCOPE +# define MODULE_SCOPE extern +#endif +MODULE_SCOPE int TCL_LOCAL_APPINIT(Tcl_Interp *); /* * The following #if block allows you to change how Tcl finds the startup @@ -54,7 +57,7 @@ extern int TCL_LOCAL_APPINIT(Tcl_Interp *interp); */ #ifdef TCL_LOCAL_MAIN_HOOK -extern int TCL_LOCAL_MAIN_HOOK(int *argc, TCHAR ***argv); +MODULE_SCOPE int TCL_LOCAL_MAIN_HOOK(int *argc, TCHAR ***argv); #endif /* @@ -193,7 +196,8 @@ Tcl_AppInit( * specific startup file will be run under any conditions. */ - (Tcl_SetVar)(interp, "tcl_rcFileName", "~/tclshrc.tcl", TCL_GLOBAL_ONLY); + (Tcl_ObjSetVar2)(interp, Tcl_NewStringObj("tcl_rcFileName", -1), NULL, + Tcl_NewStringObj("~/tclshrc.tcl", -1), TCL_GLOBAL_ONLY); return TCL_OK; } |