From 0d984b7ada501f2f945b60fcb181532452ee09f2 Mon Sep 17 00:00:00 2001 From: nijtmans Date: Tue, 27 Apr 2010 08:20:00 +0000 Subject: [Bug 2992292]: tclIOUtil.c assignment type mismatch compiler warning --- ChangeLog | 5 +++++ generic/tclIOUtil.c | 8 ++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 99b0df2..005ae29 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2010-04-27 Jan Nijtmans + + * generic/tclIOUtil.c (Tcl_FSGetNativePath): [Bug 2992292]: + tclIOUtil.c assignment type mismatch compiler warning + 2010-04-27 Kevin B. Kenny * unix/tclLoadDl.c (FindSymbol): [Bug 2992295]: Simplified the diff --git a/generic/tclIOUtil.c b/generic/tclIOUtil.c index 69114e3..eb2eb92 100644 --- a/generic/tclIOUtil.c +++ b/generic/tclIOUtil.c @@ -17,7 +17,7 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclIOUtil.c,v 1.175 2010/04/22 11:40:31 nijtmans Exp $ + * RCS: @(#) $Id: tclIOUtil.c,v 1.176 2010/04/27 08:20:00 nijtmans Exp $ */ #include "tclInt.h" @@ -3466,8 +3466,8 @@ TclpLoadFile( *clientDataPtr = handle; - *proc1Ptr = Tcl_FindSymbol(interp, handle, sym1); - *proc2Ptr = Tcl_FindSymbol(interp, handle, sym2); + *proc1Ptr = (Tcl_PackageInitProc*) Tcl_FindSymbol(interp, handle, sym1); + *proc2Ptr = (Tcl_PackageInitProc*) Tcl_FindSymbol(interp, handle, sym2); return TCL_OK; } @@ -4550,7 +4550,7 @@ Tcl_FSGetFileSystemForPath( * functions not in this file), then one cannot necessarily guarantee * that the path object pointer is from the correct filesystem. * - * Note: in the future it might be desireable to have separate versions + * Note: in the future it might be desirable to have separate versions * of this function with different signatures, for example * Tcl_FSGetNativeWinPath, Tcl_FSGetNativeUnixPath etc. Right now, since * native paths are all string based, we use just one function. -- cgit v0.12