diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-11-30 15:57:21 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-11-30 15:57:21 (GMT) |
| commit | 08edc0b3836d565811bcfd2ef554a6f9e5e9cef4 (patch) | |
| tree | 3853fa62e40f08990162cef1068c13ae66e0d37e /win | |
| parent | 38ba30a89bc4868dd7ab031e4267b2adc76c40ce (diff) | |
| parent | 17de94982b2d1f3b93a9237eb2371fbdd53695cb (diff) | |
| download | tcl-08edc0b3836d565811bcfd2ef554a6f9e5e9cef4.zip tcl-08edc0b3836d565811bcfd2ef554a6f9e5e9cef4.tar.gz tcl-08edc0b3836d565811bcfd2ef554a6f9e5e9cef4.tar.bz2 | |
Merge 8.6
Diffstat (limited to 'win')
| -rw-r--r-- | win/Makefile.in | 6 | ||||
| -rw-r--r-- | win/makefile.vc | 4 | ||||
| -rw-r--r-- | win/tclAppInit.c | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/win/Makefile.in b/win/Makefile.in index 08b04bc..34a5dcb 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/makefile.vc b/win/makefile.vc index aabc1cb..a998943 100644 --- a/win/makefile.vc +++ b/win/makefile.vc @@ -453,8 +453,8 @@ test: test-core test-pkgs test-core: setup $(TCLTEST) dlls $(CAT32)
set TCL_LIBRARY=$(ROOT:\=/)/library
$(DEBUGGER) $(TCLTEST) "$(ROOT:\=/)/tests/all.tcl" $(TESTFLAGS) -loadfile <<
- package ifneeded dde 1.4.3 [list load "$(TCLDDELIB:\=/)" dde]
- package ifneeded registry 1.3.5 [list load "$(TCLREGLIB:\=/)" registry]
+ package ifneeded dde 1.4.3 [list load "$(TCLDDELIB:\=/)" Dde]
+ package ifneeded registry 1.3.5 [list load "$(TCLREGLIB:\=/)" Registry]
<<
runtest: setup $(TCLTEST) dlls $(CAT32)
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 |