diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-10-24 11:21:31 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-10-24 11:21:31 (GMT) |
| commit | 6687886af05bb7fff4e70ccbf3903ac3a275ab32 (patch) | |
| tree | a9698a8be1ec73cd1f21ff7788d8a684ee4ea439 | |
| parent | 3d737d62cf9052d88fc73809b3e3104e047f992f (diff) | |
| parent | f5556535dc210e0697925ed3d1d446c4f34b7a61 (diff) | |
| download | tcl-6687886af05bb7fff4e70ccbf3903ac3a275ab32.zip tcl-6687886af05bb7fff4e70ccbf3903ac3a275ab32.tar.gz tcl-6687886af05bb7fff4e70ccbf3903ac3a275ab32.tar.bz2 | |
Add dummy 0 parameter (unused flags) to internal Tcl_FSLoadFileProc call, for upwards compatibility with version 2 filesystems
| -rw-r--r-- | generic/tclIOUtil.c | 6 | ||||
| -rw-r--r-- | generic/tclTest.c | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/generic/tclIOUtil.c b/generic/tclIOUtil.c index 1e600cd..f90bf0d 100644 --- a/generic/tclIOUtil.c +++ b/generic/tclIOUtil.c @@ -3149,6 +3149,9 @@ Tcl_FSLoadFile( *---------------------------------------------------------------------- */ +typedef int (Tcl_FSLoadFileProc2) (Tcl_Interp *interp, Tcl_Obj *pathPtr, + Tcl_LoadHandle *handlePtr, Tcl_FSUnloadFileProc **unloadProcPtr, int flags); + int TclLoadFile( Tcl_Interp *interp, /* Used for error reporting. */ @@ -3189,7 +3192,8 @@ TclLoadFile( proc = fsPtr->loadFileProc; if (proc != NULL) { - int retVal = (*proc)(interp, pathPtr, handlePtr, unloadProcPtr); + int retVal = ((Tcl_FSLoadFileProc2 *)proc) + (interp, pathPtr, handlePtr, unloadProcPtr, 0); if (retVal == TCL_OK) { if (*handlePtr == NULL) { return TCL_ERROR; diff --git a/generic/tclTest.c b/generic/tclTest.c index 9a1d0af..3c39a40 100644 --- a/generic/tclTest.c +++ b/generic/tclTest.c @@ -479,7 +479,7 @@ static Tcl_Filesystem testReportingFilesystem = { &TestReportRenameFile, &TestReportCopyDirectory, &TestReportLstat, - &TestReportLoadFile, + (Tcl_FSLoadFileProc *) &TestReportLoadFile, NULL /* cwd */, &TestReportChdir }; |