diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2017-09-14 08:06:34 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2017-09-14 08:06:34 (GMT) |
| commit | 17d410dd99aca2fb09af09ece6f599a633486c77 (patch) | |
| tree | 8cb83175f40cffd4deb41fb2785b5e76b5441b3c | |
| parent | ff718174aa028173010f2d04dda6ba1be59f4206 (diff) | |
| parent | 99d940211cdbe88b0459c4f15b9e6eb005b92a5a (diff) | |
| download | tcl-17d410dd99aca2fb09af09ece6f599a633486c77.zip tcl-17d410dd99aca2fb09af09ece6f599a633486c77.tar.gz tcl-17d410dd99aca2fb09af09ece6f599a633486c77.tar.bz2 | |
merge trunk
| -rw-r--r-- | generic/tclHash.c | 13 | ||||
| -rw-r--r-- | generic/tclTomMath.h | 2 | ||||
| -rw-r--r-- | library/init.tcl | 2 |
3 files changed, 2 insertions, 15 deletions
diff --git a/generic/tclHash.c b/generic/tclHash.c index 5f7908e..bb899de 100644 --- a/generic/tclHash.c +++ b/generic/tclHash.c @@ -39,19 +39,6 @@ static int CompareArrayKeys(void *keyPtr, Tcl_HashEntry *hPtr); static TCL_HASH_TYPE HashArrayKey(Tcl_HashTable *tablePtr, void *keyPtr); /* - * Prototypes for the one word hash key methods. Not actually declared because - * this is a critical path that is implemented in the core hash table access - * function. - */ - -#if 0 -static Tcl_HashEntry * AllocOneWordEntry(Tcl_HashTable *tablePtr, - void *keyPtr); -static int CompareOneWordKeys(void *keyPtr, Tcl_HashEntry *hPtr); -static unsigned int HashOneWordKey(Tcl_HashTable *tablePtr, void *keyPtr); -#endif - -/* * Prototypes for the string hash key methods. */ diff --git a/generic/tclTomMath.h b/generic/tclTomMath.h index 2ce8194..f110490 100644 --- a/generic/tclTomMath.h +++ b/generic/tclTomMath.h @@ -27,7 +27,7 @@ extern "C" { #endif /* detect 64-bit mode if possible */ -#if defined(NEVER) +#if defined(NEVER) /* 128-bit ints fail in too many places */ #if !(defined(MP_32BIT) || defined(MP_16BIT) || defined(MP_8BIT)) #define MP_64BIT #endif diff --git a/library/init.tcl b/library/init.tcl index 41cdf63..4ef78a5 100644 --- a/library/init.tcl +++ b/library/init.tcl @@ -642,7 +642,7 @@ proc auto_import {pattern} { if {$tcl_platform(platform) eq "windows"} { # Windows version. # -# Note that info executable doesn't work under Windows, so we have to +# Note that file executable doesn't work under Windows, so we have to # look for files with .exe, .com, or .bat extensions. Also, the path # may be in the Path or PATH environment variables, and path # components are separated with semicolons, not colons as under Unix. |