Diff

Differences From Artifact [9210ecc7cd]:

To Artifact [943ad6fb25]:


    33     33   
    34     34   #include "tclInt.h"
    35     35   
    36     36   #ifdef KIT_INCLUDES_ITCL
    37     37   Tcl_AppInitProc	Itcl_Init;
    38     38   #endif
    39     39   #ifdef KIT_INCLUDES_MK4TCL
    40         -Tcl_AppInitProc	Mk4tcl_Init
           40  +Tcl_AppInitProc	Mk4tcl_Init;
    41     41   #endif
    42     42   Tcl_AppInitProc Vfs_Init, Rechan_Init, Zlib_Init;
    43     43   #if 10 * TCL_MAJOR_VERSION + TCL_MINOR_VERSION < 85
    44     44   Tcl_AppInitProc	Pwb_Init;
    45     45   #endif
    46     46   #ifdef TCL_THREADS
    47     47   Tcl_AppInitProc	Thread_Init;
................................................................................
   185    185       if (Tcl_Eval(interp, initScript) == TCL_OK) {
   186    186           Tcl_Obj* path;
   187    187   #ifdef HAVE_TCLSETSTARTUPSCRIPTPATH
   188    188           path = TclGetStartupScriptPath();
   189    189   	TclSetStartupScriptPath(Tcl_GetObjResult(interp));
   190    190   #else
   191    191   #  ifdef HAVE_TCL_SETSTARTUPSCRIPT
   192         -        path = Tcl_GetStartupScriptPath(NULL);
   193         -	TclSetStartupScriptPath(Tcl_GetObjResult(interp));
          192  +        path = Tcl_GetStartupScript(NULL);
          193  +	Tcl_SetStartupScript(Tcl_GetObjResult(interp), NULL);
   194    194   #  endif
   195    195   #endif
   196    196   	if (path == NULL)
   197    197   	  Tcl_Eval(interp, "incr argc -1; set argv [lrange $argv 1 end]");
   198    198       }
   199    199   
   200    200       Tcl_SetVar(interp, "errorInfo", "", TCL_GLOBAL_ONLY);