diff options
author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-08-23 09:03:27 (GMT) |
---|---|---|
committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-08-23 09:03:27 (GMT) |
commit | 587f8fa3d9cfaccb5763689ee36cd8c41efe0689 (patch) | |
tree | 970d9d15aaa94959ec418248d6e4a9ef0ff9048b /unix | |
parent | f1d0d7967e78856e7cb13e4b48f13fe49f93d07b (diff) | |
parent | 6f191069963104ecc445087cd2869e6e6469663e (diff) | |
download | tcl-587f8fa3d9cfaccb5763689ee36cd8c41efe0689.zip tcl-587f8fa3d9cfaccb5763689ee36cd8c41efe0689.tar.gz tcl-587f8fa3d9cfaccb5763689ee36cd8c41efe0689.tar.bz2 |
Merge 8.6
Update effective_tld_names.txt.gz to the latest version.
Adapt .gitattributes and .fossil-settings/binary-glob to handle *.gz file transparently in fossil/git
Diffstat (limited to 'unix')
-rw-r--r-- | unix/configure.ac | 2 | ||||
-rw-r--r-- | unix/tclUnixChan.c | 2 | ||||
-rw-r--r-- | unix/tclUnixInit.c | 2 | ||||
-rw-r--r-- | unix/tclUnixTime.c | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/unix/configure.ac b/unix/configure.ac index ea4526c..74ee955 100644 --- a/unix/configure.ac +++ b/unix/configure.ac @@ -677,7 +677,7 @@ AC_MSG_RESULT([$tcl_ok]) #------------------------------------------------------------------------ # Check whether the timezone data is supplied by the OS or has # to be installed by Tcl. The default is autodetection, but can -# be overriden on the configure command line either way. +# be overridden on the configure command line either way. #------------------------------------------------------------------------ AC_MSG_CHECKING([for timezone data]) diff --git a/unix/tclUnixChan.c b/unix/tclUnixChan.c index be49c95..5e757ee 100644 --- a/unix/tclUnixChan.c +++ b/unix/tclUnixChan.c @@ -96,7 +96,7 @@ typedef struct { /* * The following structure is used to set or get the serial port attributes in - * a platform-independant manner. + * a platform-independent manner. */ typedef struct { diff --git a/unix/tclUnixInit.c b/unix/tclUnixInit.c index eec0fd9..13a624e 100644 --- a/unix/tclUnixInit.c +++ b/unix/tclUnixInit.c @@ -333,7 +333,7 @@ long tclMacOSXDarwinRelease = 0; * * TclpInitPlatform -- * - * Initialize all the platform-dependant things like signals and + * Initialize all the platform-dependent things like signals and * floating-point error handling. * * Called at process initialization time. diff --git a/unix/tclUnixTime.c b/unix/tclUnixTime.c index 51d486e..1b90f6e 100644 --- a/unix/tclUnixTime.c +++ b/unix/tclUnixTime.c @@ -117,7 +117,7 @@ TclpGetMicroseconds(void) * This procedure returns a value that represents the highest resolution * clock available on the system. There are no garantees on what the * resolution will be. In Tcl we will call this value a "click". The - * start time is also system dependant. + * start time is also system dependent. * * Results: * Number of clicks from some start time. @@ -166,7 +166,7 @@ TclpGetClicks(void) * This procedure returns a WideInt value that represents the highest * resolution clock available on the system. There are no garantees on * what the resolution will be. In Tcl we will call this value a "click". - * The start time is also system dependant. + * The start time is also system dependent. * * Results: * Number of WideInt clicks from some start time. |