summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.fossil-settings/binary-glob7
-rw-r--r--.fossil-settings/crnl-glob4
-rw-r--r--.fossil-settings/encoding-glob2
-rw-r--r--.fossil-settings/ignore-glob2
-rw-r--r--compat/zlib/win32/README.txt6
-rw-r--r--compat/zlib/win32/zdll.libbin15658 -> 17152 bytes
-rwxr-xr-xcompat/zlib/win32/zlib1.dllbin107520 -> 104960 bytes
-rw-r--r--compat/zlib/win64/libz.dll.abin46874 -> 51638 bytes
-rw-r--r--compat/zlib/win64/zdll.libbin15288 -> 16740 bytes
-rwxr-xr-xcompat/zlib/win64/zlib1.dllbin112640 -> 116224 bytes
-rw-r--r--generic/tclLoad.c20
11 files changed, 25 insertions, 16 deletions
diff --git a/.fossil-settings/binary-glob b/.fossil-settings/binary-glob
index 509939c..ec574be 100644
--- a/.fossil-settings/binary-glob
+++ b/.fossil-settings/binary-glob
@@ -1,4 +1,9 @@
+compat/zlib/win32/zdll.lib
+compat/zlib/win32/zlib1.dll
+compat/zlib/win64/zdll.lib
+compat/zlib/win64/zlib1.dll
+compat/zlib/win64/libz.dll.a
compat/zlib/zlib.3.pdf
*.bmp
*.gif
-*.png
+*.png \ No newline at end of file
diff --git a/.fossil-settings/crnl-glob b/.fossil-settings/crnl-glob
index cc8dd26..8773e68 100644
--- a/.fossil-settings/crnl-glob
+++ b/.fossil-settings/crnl-glob
@@ -1,6 +1,8 @@
compat/zlib/contrib/dotzlib/DotZLib/UnitTests.cs
compat/zlib/contrib/vstudio/readme.txt
compat/zlib/contrib/vstudio/*/zlib.rc
+compat/zlib/win32/*.txt
+compat/zlib/win64/*.txt
tools/tcl.hpj.in
tools/tcl.wse.in
win/buildall.vc.bat
@@ -10,4 +12,4 @@ win/makefile.vc
win/rules.vc
win/tcl.dsp
win/tcl.dsw
-win/tcl.hpj.in
+win/tcl.hpj.in \ No newline at end of file
diff --git a/.fossil-settings/encoding-glob b/.fossil-settings/encoding-glob
index c014320..25ad865 100644
--- a/.fossil-settings/encoding-glob
+++ b/.fossil-settings/encoding-glob
@@ -7,4 +7,4 @@ win/makefile.vc
win/rules.vc
win/tcl.dsp
win/tcl.dsw
-win/tcl.hpj.in
+win/tcl.hpj.in \ No newline at end of file
diff --git a/.fossil-settings/ignore-glob b/.fossil-settings/ignore-glob
index 2126c62..08d388d 100644
--- a/.fossil-settings/ignore-glob
+++ b/.fossil-settings/ignore-glob
@@ -43,4 +43,4 @@ unix/pkgs/*
win/Debug_VC*
win/Release_VC*
win/pkgs/*
-win/tcl.hpj
+win/tcl.hpj \ No newline at end of file
diff --git a/compat/zlib/win32/README.txt b/compat/zlib/win32/README.txt
index 34a13b3..de1d05a 100644
--- a/compat/zlib/win32/README.txt
+++ b/compat/zlib/win32/README.txt
@@ -6,7 +6,7 @@ What's here
Source
======
- zlib version 1.2.8
+ zlib version 1.2.10
available at http://www.gzip.org/zlib/
@@ -25,9 +25,9 @@ Build info
Contributed by Jan Nijtmans.
Compiler:
- i686-w64-mingw32-gcc (GCC) 4.5.3
+ i686-w64-mingw32-gcc (GCC) 5.4.0
Library:
- mingw64-i686-runtime/headers: 3.0b_svn5747-1
+ mingw64-i686-runtime/headers: 5.0.0
Build commands:
i686-w64-mingw32-gcc -c -DASMV contrib/asm686/match.S
i686-w64-mingw32-gcc -c -DASMINF -I. -O3 contrib/inflate86/inffas86.c
diff --git a/compat/zlib/win32/zdll.lib b/compat/zlib/win32/zdll.lib
index 8e6f719..5807541 100644
--- a/compat/zlib/win32/zdll.lib
+++ b/compat/zlib/win32/zdll.lib
Binary files differ
diff --git a/compat/zlib/win32/zlib1.dll b/compat/zlib/win32/zlib1.dll
index 9ea38d5..81f53ec 100755
--- a/compat/zlib/win32/zlib1.dll
+++ b/compat/zlib/win32/zlib1.dll
Binary files differ
diff --git a/compat/zlib/win64/libz.dll.a b/compat/zlib/win64/libz.dll.a
index a3ae403..d90a90c 100644
--- a/compat/zlib/win64/libz.dll.a
+++ b/compat/zlib/win64/libz.dll.a
Binary files differ
diff --git a/compat/zlib/win64/zdll.lib b/compat/zlib/win64/zdll.lib
index ac9ffc9..db56951 100644
--- a/compat/zlib/win64/zdll.lib
+++ b/compat/zlib/win64/zdll.lib
Binary files differ
diff --git a/compat/zlib/win64/zlib1.dll b/compat/zlib/win64/zlib1.dll
index bd1dbc6..86b6bbe 100755
--- a/compat/zlib/win64/zlib1.dll
+++ b/compat/zlib/win64/zlib1.dll
Binary files differ
diff --git a/generic/tclLoad.c b/generic/tclLoad.c
index 44085d6..bcda420 100644
--- a/generic/tclLoad.c
+++ b/generic/tclLoad.c
@@ -1074,20 +1074,27 @@ TclGetLoadedPackagesEx(
return TCL_OK;
}
+ target = Tcl_GetSlave(interp, targetName);
+ if (target == NULL) {
+ return TCL_ERROR;
+ }
+ ipPtr = Tcl_GetAssocData(target, "tclLoad", NULL);
+
/*
* Return information about all of the available packages.
*/
if (packageName) {
resultObj = NULL;
- Tcl_MutexLock(&packageMutex);
- for (pkgPtr = firstPackagePtr; pkgPtr != NULL;
- pkgPtr = pkgPtr->nextPtr) {
+
+ for (; ipPtr != NULL; ipPtr = ipPtr->nextPtr) {
+ pkgPtr = ipPtr->pkgPtr;
+
if (!strcmp(packageName, pkgPtr->packageName)) {
resultObj = Tcl_NewStringObj(pkgPtr->fileName, -1);
break;
}
}
- Tcl_MutexUnlock(&packageMutex);
+
if (resultObj) {
Tcl_SetObjResult(interp, resultObj);
}
@@ -1099,11 +1106,6 @@ TclGetLoadedPackagesEx(
* interpreter.
*/
- target = Tcl_GetSlave(interp, targetName);
- if (target == NULL) {
- return TCL_ERROR;
- }
- ipPtr = Tcl_GetAssocData(target, "tclLoad", NULL);
resultObj = Tcl_NewObj();
for (; ipPtr != NULL; ipPtr = ipPtr->nextPtr) {
pkgPtr = ipPtr->pkgPtr;