diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-12-04 15:12:19 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-12-04 15:12:19 (GMT) |
| commit | 6443a1db3be2198d76bc754d9a0f5a9c08683342 (patch) | |
| tree | b24ba1d27f6f2ff0048046b18e73defec6854a56 /generic/tclIOUtil.c | |
| parent | bf23a021385451ff52770191acec3f55d5c8575a (diff) | |
| parent | cb5c9f4f89b6e7242ba07f84e278d35f202d7edd (diff) | |
| download | tcl-6443a1db3be2198d76bc754d9a0f5a9c08683342.zip tcl-6443a1db3be2198d76bc754d9a0f5a9c08683342.tar.gz tcl-6443a1db3be2198d76bc754d9a0f5a9c08683342.tar.bz2 | |
Merge 9.0
Diffstat (limited to 'generic/tclIOUtil.c')
| -rw-r--r-- | generic/tclIOUtil.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/generic/tclIOUtil.c b/generic/tclIOUtil.c index 4cd2c6d..9d1e4d2 100644 --- a/generic/tclIOUtil.c +++ b/generic/tclIOUtil.c @@ -1757,7 +1757,7 @@ Tcl_FSEvalFileEx( */ if (Tcl_ReadChars(chan, objPtr, -1, - memcmp(string, "\xef\xbb\xbf", 3)) == TCL_IO_FAILURE) { + memcmp(string, "\xEF\xBB\xBF", 3)) == TCL_IO_FAILURE) { Tcl_CloseEx(interp, chan, 0); Tcl_SetObjResult(interp, Tcl_ObjPrintf( "couldn't read file \"%s\": %s", @@ -1894,7 +1894,7 @@ TclNREvalFile( */ if (Tcl_ReadChars(chan, objPtr, -1, - memcmp(string, "\xef\xbb\xbf", 3)) == TCL_IO_FAILURE) { + memcmp(string, "\xEF\xBB\xBF", 3)) == TCL_IO_FAILURE) { Tcl_CloseEx(interp, chan, 0); Tcl_SetObjResult(interp, Tcl_ObjPrintf( "couldn't read file \"%s\": %s", @@ -3010,7 +3010,7 @@ Tcl_FSLoadFile( const char *sym1, const char *sym2, /* Names of two functions to find in the * dynamic shared object. */ - Tcl_PackageInitProc **proc1Ptr, Tcl_PackageInitProc **proc2Ptr, + Tcl_LibraryInitProc **proc1Ptr, Tcl_LibraryInitProc **proc2Ptr, /* Places to store pointers to the functions * named by sym1 and sym2. */ Tcl_LoadHandle *handlePtr, /* A place to store the token for the loaded @@ -3028,8 +3028,8 @@ Tcl_FSLoadFile( res = Tcl_LoadFile(interp, pathPtr, symbols, 0, procPtrs, handlePtr); if (res == TCL_OK) { - *proc1Ptr = (Tcl_PackageInitProc *) procPtrs[0]; - *proc2Ptr = (Tcl_PackageInitProc *) procPtrs[1]; + *proc1Ptr = (Tcl_LibraryInitProc *) procPtrs[0]; + *proc2Ptr = (Tcl_LibraryInitProc *) procPtrs[1]; } else { *proc1Ptr = *proc2Ptr = NULL; } |