summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--generic/regcomp.c2
-rw-r--r--generic/tclCmdMZ.c4
-rw-r--r--generic/tclEnsemble.c2
-rw-r--r--generic/tclIO.h2
-rw-r--r--generic/tclMain.c4
-rw-r--r--generic/tclPkg.c2
-rw-r--r--generic/tclThreadAlloc.c2
-rw-r--r--generic/tclVar.c4
-rw-r--r--generic/tclZlib.c2
-rw-r--r--library/platform/pkgIndex.tcl2
-rw-r--r--library/platform/platform.tcl13
-rw-r--r--unix/Makefile.in4
-rw-r--r--win/Makefile.in4
13 files changed, 27 insertions, 20 deletions
diff --git a/generic/regcomp.c b/generic/regcomp.c
index 7bd9483..1f6c2f0 100644
--- a/generic/regcomp.c
+++ b/generic/regcomp.c
@@ -592,7 +592,7 @@ makesearch(
break;
}
}
-
+
/*
* We want to mark states as being in the list already by having non
* NULL tmp fields, but we can't just store the old slist value in tmp
diff --git a/generic/tclCmdMZ.c b/generic/tclCmdMZ.c
index 20f5710..1d76a5b 100644
--- a/generic/tclCmdMZ.c
+++ b/generic/tclCmdMZ.c
@@ -38,7 +38,7 @@ static int UniCharIsHexDigit(int character);
* UTF-8 literal string containing all Unicode space characters [TIP #413]
*/
-const char tclDefaultTrimSet[] =
+const char tclDefaultTrimSet[] =
"\x09\x0a\x0b\x0c\x0d " /* ASCII */
"\xc0\x80" /* nul (U+0000) */
"\xc2\x85" /* next line (U+0085) */
@@ -2884,7 +2884,7 @@ StringCatCmd(
Tcl_AppendObjToObj(objResultPtr, objv[i]);
}
Tcl_SetObjResult(interp, objResultPtr);
-
+
return TCL_OK;
}
diff --git a/generic/tclEnsemble.c b/generic/tclEnsemble.c
index 4be5714..ff97adf 100644
--- a/generic/tclEnsemble.c
+++ b/generic/tclEnsemble.c
@@ -3115,7 +3115,7 @@ TclAttemptCompileProc(
result = cmdPtr->compileProc(interp, parsePtr, cmdPtr, envPtr);
/*
- * Undo the shift.
+ * Undo the shift.
*/
mapPtr->loc[eclIndex].line -= (depth - 1);
diff --git a/generic/tclIO.h b/generic/tclIO.h
index 7aa07eb..b799375 100644
--- a/generic/tclIO.h
+++ b/generic/tclIO.h
@@ -126,7 +126,7 @@ typedef struct Channel {
*/
typedef struct ChannelState {
- char *channelName; /* The name of the channel instance in Tcl
+ char *channelName; /* The name of the channel instance in Tcl
* commands. Storage is owned by the generic
* IO code, is dynamically allocated. */
int flags; /* ORed combination of the flags defined
diff --git a/generic/tclMain.c b/generic/tclMain.c
index 70f705b..3a09b0c 100644
--- a/generic/tclMain.c
+++ b/generic/tclMain.c
@@ -623,7 +623,7 @@ Tcl_MainEx(
if (!Tcl_InterpDeleted(interp) && !Tcl_LimitExceeded(interp)) {
Tcl_Obj *cmd = Tcl_ObjPrintf("exit %d", exitCode);
-
+
Tcl_IncrRefCount(cmd);
Tcl_EvalObjEx(interp, cmd, TCL_EVAL_GLOBAL);
Tcl_DecrRefCount(cmd);
@@ -721,7 +721,7 @@ TclFullFinalizationRequested(void)
const char *fin;
Tcl_DString ds;
int finalize = 0;
-
+
fin = TclGetEnv("TCL_FINALIZE_ON_EXIT", &ds);
finalize = ((fin != NULL) && strcmp(fin, "0"));
if (fin != NULL) {
diff --git a/generic/tclPkg.c b/generic/tclPkg.c
index ec5d0e6..b269e9a 100644
--- a/generic/tclPkg.c
+++ b/generic/tclPkg.c
@@ -357,7 +357,7 @@ PkgRequireCore(
if (pkgPtr->clientData != NULL) {
Tcl_SetObjResult(interp, Tcl_ObjPrintf(
"circular package dependency:"
- " attempt to provide %s %s requires %s",
+ " attempt to provide %s %s requires %s",
name, (char *) pkgPtr->clientData, name));
AddRequirementsToResult(interp, reqc, reqv);
Tcl_SetErrorCode(interp, "TCL", "PACKAGE", "CIRCULARITY", NULL);
diff --git a/generic/tclThreadAlloc.c b/generic/tclThreadAlloc.c
index 4e4ce41..7111e8f 100644
--- a/generic/tclThreadAlloc.c
+++ b/generic/tclThreadAlloc.c
@@ -1107,7 +1107,7 @@ TclFinalizeThreadAlloc(void)
* TclFinalizeThreadAllocThread --
*
* This procedure is used to destroy single thread private resources used
- * in this file.
+ * in this file.
* Called in TclpFinalizeThreadData when a thread exits (Tcl_FinalizeThread).
*
* Results:
diff --git a/generic/tclVar.c b/generic/tclVar.c
index e18d472..1048917 100644
--- a/generic/tclVar.c
+++ b/generic/tclVar.c
@@ -6166,10 +6166,10 @@ CompareVarKeys(
/*
* If the object pointers are the same then they match.
* OPT: this comparison was moved to the caller
-
+
if (objPtr1 == objPtr2) return 1;
*/
-
+
/*
* Don't use Tcl_GetStringFromObj as it would prevent l1 and l2 being in a
* register.
diff --git a/generic/tclZlib.c b/generic/tclZlib.c
index e4369b1..5bd896d 100644
--- a/generic/tclZlib.c
+++ b/generic/tclZlib.c
@@ -1534,7 +1534,7 @@ Tcl_ZlibDeflate(
if (!interp) {
return TCL_ERROR;
}
-
+
/*
* Compressed format is specified by the wbits parameter. See zlib.h for
* details.
diff --git a/library/platform/pkgIndex.tcl b/library/platform/pkgIndex.tcl
index 5250163..5970a3f 100644
--- a/library/platform/pkgIndex.tcl
+++ b/library/platform/pkgIndex.tcl
@@ -1,3 +1,3 @@
-package ifneeded platform 1.0.13 [list source [file join $dir platform.tcl]]
+package ifneeded platform 1.0.14 [list source [file join $dir platform.tcl]]
package ifneeded platform::shell 1.1.4 [list source [file join $dir shell.tcl]]
diff --git a/library/platform/platform.tcl b/library/platform/platform.tcl
index e0bcce6..9a21a25 100644
--- a/library/platform/platform.tcl
+++ b/library/platform/platform.tcl
@@ -95,7 +95,11 @@ proc ::platform::generic {} {
switch -- $plat {
windows {
- set plat win32
+ if {$tcl_platform(platform) == "unix"} {
+ set plat cygwin_nt
+ } else {
+ set plat win32
+ }
if {$cpu eq "amd64"} {
# Do not check wordSize, win32-x64 is an IL32P64 platform.
set cpu x86_64
@@ -158,9 +162,12 @@ proc ::platform::identify {} {
global tcl_platform
set id [generic]
- regexp {^([^-]+)-([^-]+)$} $id -> plat cpu
+ regexp {^([^-]+)(-[0-9\.]+)?(-wow)?-([^-]+)$} $id -> plat ver wow cpu
switch -- $plat {
+ cygwin_nt {
+ return "${plat}-${cpu}"
+ }
solaris {
regsub {^5} $tcl_platform(osVersion) 2 text
append plat $text
@@ -371,7 +378,7 @@ proc ::platform::patterns {id} {
# ### ### ### ######### ######### #########
## Ready
-package provide platform 1.0.13
+package provide platform 1.0.14
# ### ### ### ######### ######### #########
## Demo application
diff --git a/unix/Makefile.in b/unix/Makefile.in
index 9e63693..018cb8a 100644
--- a/unix/Makefile.in
+++ b/unix/Makefile.in
@@ -850,8 +850,8 @@ install-libraries: libraries
@echo "Installing package tcltest 2.3.8 as a Tcl Module";
@$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/tcltest.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.5/tcltest-2.3.8.tm;
- @echo "Installing package platform 1.0.13 as a Tcl Module";
- @$(INSTALL_DATA) $(TOP_DIR)/library/platform/platform.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.4/platform-1.0.13.tm;
+ @echo "Installing package platform 1.0.14 as a Tcl Module";
+ @$(INSTALL_DATA) $(TOP_DIR)/library/platform/platform.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.4/platform-1.0.14.tm;
@echo "Installing package platform::shell 1.1.4 as a Tcl Module";
@$(INSTALL_DATA) $(TOP_DIR)/library/platform/shell.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.4/platform/shell-1.1.4.tm;
diff --git a/win/Makefile.in b/win/Makefile.in
index 011ebb7..dcbb831 100644
--- a/win/Makefile.in
+++ b/win/Makefile.in
@@ -650,8 +650,8 @@ install-libraries: libraries install-tzdata install-msgs
@$(COPY) $(ROOT_DIR)/library/msgcat/msgcat.tcl $(SCRIPT_INSTALL_DIR)/../tcl8/8.5/msgcat-1.6.0.tm;
@echo "Installing package tcltest 2.3.8 as a Tcl Module";
@$(COPY) $(ROOT_DIR)/library/tcltest/tcltest.tcl $(SCRIPT_INSTALL_DIR)/../tcl8/8.5/tcltest-2.3.8.tm;
- @echo "Installing package platform 1.0.13 as a Tcl Module";
- @$(COPY) $(ROOT_DIR)/library/platform/platform.tcl $(SCRIPT_INSTALL_DIR)/../tcl8/8.4/platform-1.0.13.tm;
+ @echo "Installing package platform 1.0.14 as a Tcl Module";
+ @$(COPY) $(ROOT_DIR)/library/platform/platform.tcl $(SCRIPT_INSTALL_DIR)/../tcl8/8.4/platform-1.0.14.tm;
@echo "Installing package platform::shell 1.1.4 as a Tcl Module";
@$(COPY) $(ROOT_DIR)/library/platform/shell.tcl $(SCRIPT_INSTALL_DIR)/../tcl8/8.4/platform/shell-1.1.4.tm;
@echo "Installing encodings";
generated by cgit v0.12 at 2024-07-15 14:06:58 (GMT)