diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2021-01-15 13:57:32 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2021-01-15 13:57:32 (GMT) |
| commit | b60a9ffd6aaae0cc0218ac36474c1f72db036ca8 (patch) | |
| tree | afa1f85f64fbaa3b337c3f19fe5e82ec74e9c23e /generic/tclLoad.c | |
| parent | ec714e1d4fe3c39ba19520dbf55debd3ac26cbae (diff) | |
| parent | eeedefc089774c80cd5405e2aeff3485992bf31d (diff) | |
| download | tcl-b60a9ffd6aaae0cc0218ac36474c1f72db036ca8.zip tcl-b60a9ffd6aaae0cc0218ac36474c1f72db036ca8.tar.gz tcl-b60a9ffd6aaae0cc0218ac36474c1f72db036ca8.tar.bz2 | |
Merge 9.0
Diffstat (limited to 'generic/tclLoad.c')
| -rw-r--r-- | generic/tclLoad.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/generic/tclLoad.c b/generic/tclLoad.c index 9b9f9bd..8586d8a 100644 --- a/generic/tclLoad.c +++ b/generic/tclLoad.c @@ -307,7 +307,7 @@ Tcl_LoadObjCmd( /* * The platform-specific code couldn't figure out the prefix. * Make a guess by taking the last element of the file - * name, stripping off any leading "lib" and/or "tcl", and + * name, stripping off any leading "lib" and/or "tcl9", and * then using all of the alphabetic and underline characters * that follow that. */ @@ -315,12 +315,6 @@ Tcl_LoadObjCmd( splitPtr = Tcl_FSSplitPath(objv[1], &pElements); Tcl_ListObjIndex(NULL, splitPtr, pElements -1, &pkgGuessPtr); pkgGuess = TclGetString(pkgGuessPtr); -#if defined(_WIN32) || defined(__CYGWIN__) - if ((pkgGuess[0] == 'w') && (pkgGuess[1] == 'i') - && (pkgGuess[2] == 'n')) { - pkgGuess += 3; - } else -#endif /* __CYGWIN__ */ if ((pkgGuess[0] == 'l') && (pkgGuess[1] == 'i') && (pkgGuess[2] == 'b')) { pkgGuess += 3; @@ -332,8 +326,8 @@ Tcl_LoadObjCmd( } #endif /* __CYGWIN__ */ if ((pkgGuess[0] == 't') && (pkgGuess[1] == 'c') - && (pkgGuess[2] == 'l')) { - pkgGuess += 3; + && (pkgGuess[2] == 'l') && (pkgGuess[2] == '9')) { + pkgGuess += 4; } for (p = pkgGuess; *p != 0; p += offset) { offset = TclUtfToUniChar(p, &ch); |