summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordkf <donal.k.fellows@manchester.ac.uk>2012-10-29 12:03:51 (GMT)
committerdkf <donal.k.fellows@manchester.ac.uk>2012-10-29 12:03:51 (GMT)
commit323d5b827ecb3d31ba1bf559dbfbd64100bd9b73 (patch)
tree831bd95e5196e7b61ae17cdead4aff37b60a9ada
parent886fc6d1e98ed9bf51f884ae2e68d391c5033b3e (diff)
parent9c1bac129cc0a8d54989866bfaf2a98e48f933ed (diff)
downloadtcl-323d5b827ecb3d31ba1bf559dbfbd64100bd9b73.zip
tcl-323d5b827ecb3d31ba1bf559dbfbd64100bd9b73.tar.gz
tcl-323d5b827ecb3d31ba1bf559dbfbd64100bd9b73.tar.bz2
merge trunk
-rw-r--r--generic/tclTest.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/generic/tclTest.c b/generic/tclTest.c
index 5dc95f9..1734968 100644
--- a/generic/tclTest.c
+++ b/generic/tclTest.c
@@ -381,7 +381,8 @@ static Tcl_FSRenameFileProc TestReportRenameFile;
static Tcl_FSCreateDirectoryProc TestReportCreateDirectory;
static Tcl_FSCopyDirectoryProc TestReportCopyDirectory;
static Tcl_FSRemoveDirectoryProc TestReportRemoveDirectory;
-static Tcl_FSLoadFileProc TestReportLoadFile;
+static int TestReportLoadFile(Tcl_Interp *interp, Tcl_Obj *pathPtr,
+ Tcl_LoadHandle *handlePtr, Tcl_FSUnloadFileProc **unloadProcPtr);
static Tcl_FSLinkProc TestReportLink;
static Tcl_FSFileAttrStringsProc TestReportFileAttrStrings;
static Tcl_FSFileAttrsGetProc TestReportFileAttrsGet;
@@ -446,7 +447,7 @@ static const Tcl_Filesystem testReportingFilesystem = {
TestReportRenameFile,
TestReportCopyDirectory,
TestReportLstat,
- TestReportLoadFile,
+ (Tcl_FSLoadFileProc *) TestReportLoadFile,
NULL /* cwd */,
TestReportChdir
};