diff options
| author | dgp <dgp@users.sourceforge.net> | 2020-11-10 16:40:14 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2020-11-10 16:40:14 (GMT) |
| commit | a10c03884b5bcc4f05021cb4aeac39f234b961ea (patch) | |
| tree | 7643f111387b7e5cd78214a3be506828e09c680e /win | |
| parent | 78d559eab4dc2dabbc90a0664a0b1fc460f1884d (diff) | |
| parent | 810bafae9ab897a7e167f815feeb4333594aca4c (diff) | |
| download | tcl-a10c03884b5bcc4f05021cb4aeac39f234b961ea.zip tcl-a10c03884b5bcc4f05021cb4aeac39f234b961ea.tar.gz tcl-a10c03884b5bcc4f05021cb4aeac39f234b961ea.tar.bz2 | |
merge 8.6
Diffstat (limited to 'win')
| -rw-r--r-- | win/Makefile.in | 6 | ||||
| -rw-r--r-- | win/tclAppInit.c | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/win/Makefile.in b/win/Makefile.in index cfa4163..f984114 100644 --- a/win/Makefile.in +++ b/win/Makefile.in @@ -155,9 +155,9 @@ REG_LIB_FILE = @LIBPREFIX@tclreg$(REGVER)${DLLSUFFIX}${LIBSUFFIX} TEST_DLL_FILE = tcltest$(VER)${DLLSUFFIX} TEST_EXE_FILE = tcltest${EXESUFFIX} TEST_LIB_FILE = @LIBPREFIX@tcltest$(VER)${DLLSUFFIX}${LIBSUFFIX} -TEST_LOAD_PRMS = package ifneeded dde 1.4.3 [list load [file normalize ${DDE_DLL_FILE}] dde];\ - package ifneeded registry 1.3.5 [list load [file normalize ${REG_DLL_FILE}] registry] -TEST_LOAD_FACILITIES = package ifneeded Tcltest ${VERSION}@TCL_PATCH_LEVEL@ [list load [file normalize ${TEST_DLL_FILE}] Tcltest];\ +TEST_LOAD_PRMS = package ifneeded dde 1.4.3 [list load [file normalize ${DDE_DLL_FILE}] Dde];\ + package ifneeded registry 1.3.5 [list load [file normalize ${REG_DLL_FILE}] Registry] +TEST_LOAD_FACILITIES = package ifneeded Tcltest ${VERSION}@TCL_PATCH_LEVEL@ [list load [file normalize ${TEST_DLL_FILE}]];\ $(TEST_LOAD_PRMS) ZLIB_DLL_FILE = zlib1.dll diff --git a/win/tclAppInit.c b/win/tclAppInit.c index f78f788..695099e 100644 --- a/win/tclAppInit.c +++ b/win/tclAppInit.c @@ -163,12 +163,12 @@ Tcl_AppInit( 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 |