Import Tcl 8.6.11
This commit is contained in:
@@ -29,7 +29,7 @@ extern Tcl_PackageInitProc Tcltest_Init;
|
||||
extern Tcl_PackageInitProc Tcltest_SafeInit;
|
||||
#endif /* TCL_TEST */
|
||||
|
||||
#if defined(STATIC_BUILD) && TCL_USE_STATIC_PACKAGES
|
||||
#if defined(STATIC_BUILD) && defined(TCL_USE_STATIC_PACKAGES) && TCL_USE_STATIC_PACKAGES
|
||||
extern Tcl_PackageInitProc Registry_Init;
|
||||
extern Tcl_PackageInitProc Dde_Init;
|
||||
extern Tcl_PackageInitProc Dde_SafeInit;
|
||||
@@ -159,16 +159,16 @@ Tcl_AppInit(
|
||||
return TCL_ERROR;
|
||||
}
|
||||
|
||||
#if defined(STATIC_BUILD) && TCL_USE_STATIC_PACKAGES
|
||||
#if defined(STATIC_BUILD) && defined(TCL_USE_STATIC_PACKAGES) && TCL_USE_STATIC_PACKAGES
|
||||
if (Registry_Init(interp) == TCL_ERROR) {
|
||||
return TCL_ERROR;
|
||||
}
|
||||
Tcl_StaticPackage(interp, "registry", Registry_Init, NULL);
|
||||
Tcl_StaticPackage(interp, "Registry", Registry_Init, NULL);
|
||||
|
||||
if (Dde_Init(interp) == TCL_ERROR) {
|
||||
return TCL_ERROR;
|
||||
}
|
||||
Tcl_StaticPackage(interp, "dde", Dde_Init, Dde_SafeInit);
|
||||
Tcl_StaticPackage(interp, "Dde", Dde_Init, Dde_SafeInit);
|
||||
#endif
|
||||
|
||||
#ifdef TCL_TEST
|
||||
@@ -268,7 +268,7 @@ setargv(
|
||||
#undef Tcl_Alloc
|
||||
#undef Tcl_DbCkalloc
|
||||
|
||||
argSpace = ckalloc(size * sizeof(char *)
|
||||
argSpace = (TCHAR *)ckalloc(size * sizeof(char *)
|
||||
+ (_tcslen(cmdLine) * sizeof(TCHAR)) + sizeof(TCHAR));
|
||||
argv = (TCHAR **) argSpace;
|
||||
argSpace += size * (sizeof(char *)/sizeof(TCHAR));
|
||||
|
||||
Reference in New Issue
Block a user