summaryrefslogtreecommitdiffstats
path: root/win/winMain.c
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2020-11-16 08:56:18 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2020-11-16 08:56:18 (GMT)
commit506d559afbf724b2943dca074e5622e8c4daba92 (patch)
treeeaee370a139c28d91c930254f19c5a717439e9f2 /win/winMain.c
parent50a8f8ca15b45f3174230a8692f427d39d839fce (diff)
parent64f6d7d3d9f3f06939f8b614f0a2dbc76107e8b2 (diff)
downloadtk-506d559afbf724b2943dca074e5622e8c4daba92.zip
tk-506d559afbf724b2943dca074e5622e8c4daba92.tar.gz
tk-506d559afbf724b2943dca074e5622e8c4daba92.tar.bz2
Merge 8.7
Diffstat (limited to 'win/winMain.c')
-rw-r--r--win/winMain.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/win/winMain.c b/win/winMain.c
index 13913f4..744a08b 100644
--- a/win/winMain.c
+++ b/win/winMain.c
@@ -35,7 +35,7 @@ extern Tcl_PackageInitProc Tktest_Init;
#endif
#endif /* TK_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;
@@ -208,16 +208,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, 0);
+ Tcl_StaticPackage(interp, "Registry", Registry_Init, 0);
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 TK_TEST