summaryrefslogtreecommitdiffstats
path: root/generic
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2012-11-13 21:03:28 (GMT)
committerdgp <dgp@users.sourceforge.net>2012-11-13 21:03:28 (GMT)
commit5b2d20cdcbe08cf350f3adc4e83618cdd5720cf7 (patch)
treee03b318dbb0e29de111d837975f499df3be1a176 /generic
parentfd53317415e2ad6115af604bbe52c4ef4f080dcb (diff)
parentba16c7a4403b1fa99daafb9292751bf572c09616 (diff)
downloadtcl-bug_3567063.zip
tcl-bug_3567063.tar.gz
tcl-bug_3567063.tar.bz2
merge 8.4bug_3567063
Diffstat (limited to 'generic')
-rw-r--r--generic/tclIOUtil.c6
-rw-r--r--generic/tclTest.c2
2 files changed, 6 insertions, 2 deletions
diff --git a/generic/tclIOUtil.c b/generic/tclIOUtil.c
index 69b7e44..cfa01f0 100644
--- a/generic/tclIOUtil.c
+++ b/generic/tclIOUtil.c
@@ -2774,6 +2774,9 @@ Tcl_FSChdir(pathPtr)
*----------------------------------------------------------------------
*/
+typedef int (Tcl_FSLoadFileProc2) (Tcl_Interp *interp, Tcl_Obj *pathPtr,
+ Tcl_LoadHandle *handlePtr, Tcl_FSUnloadFileProc **unloadProcPtr, int flags);
+
int
Tcl_FSLoadFile(interp, pathPtr, sym1, sym2, proc1Ptr, proc2Ptr,
handlePtr, unloadProcPtr)
@@ -2797,7 +2800,8 @@ Tcl_FSLoadFile(interp, pathPtr, sym1, sym2, proc1Ptr, proc2Ptr,
if (fsPtr != NULL) {
Tcl_FSLoadFileProc *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) {
return retVal;
}
diff --git a/generic/tclTest.c b/generic/tclTest.c
index 8256461..998416c 100644
--- a/generic/tclTest.c
+++ b/generic/tclTest.c
@@ -468,7 +468,7 @@ static Tcl_Filesystem testReportingFilesystem = {
&TestReportRenameFile,
&TestReportCopyDirectory,
&TestReportLstat,
- &TestReportLoadFile,
+ (Tcl_FSLoadFileProc *) &TestReportLoadFile,
NULL /* cwd */,
&TestReportChdir
};