summaryrefslogtreecommitdiffstats
path: root/generic/tclStubLib.c
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2012-12-10 20:54:49 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2012-12-10 20:54:49 (GMT)
commit1f46b14efb4cff5cd99eecd20058ec3d98b283a5 (patch)
tree155d0247e71240908708605203ad917c1faf9d96 /generic/tclStubLib.c
parentc69e1e2500a8de36ee29f0220170bddaf320b3f1 (diff)
parentfb5daf45d18254aa262a8727aae8a18eb235f838 (diff)
downloadtcl-1f46b14efb4cff5cd99eecd20058ec3d98b283a5.zip
tcl-1f46b14efb4cff5cd99eecd20058ec3d98b283a5.tar.gz
tcl-1f46b14efb4cff5cd99eecd20058ec3d98b283a5.tar.bz2
merge trunk
Diffstat (limited to 'generic/tclStubLib.c')
-rw-r--r--generic/tclStubLib.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/generic/tclStubLib.c b/generic/tclStubLib.c
index e48e60b..720d9ef 100644
--- a/generic/tclStubLib.c
+++ b/generic/tclStubLib.c
@@ -79,6 +79,7 @@ TclInitStubs(
int magic)
{
const char *actualVersion = NULL;
+ ClientData pkgData = NULL;
const TclStubs *stubsPtr;
/*
@@ -92,7 +93,7 @@ TclInitStubs(
return NULL;
}
- actualVersion = stubsPtr->tcl_PkgRequireEx(interp, "Tcl", version, 0, NULL);
+ actualVersion = stubsPtr->tcl_PkgRequireEx(interp, "Tcl", version, 0, &pkgData);
if (actualVersion == NULL) {
return NULL;
}
@@ -122,7 +123,7 @@ TclInitStubs(
}
}
}
- tclStubsPtr = stubsPtr;
+ tclStubsPtr = (TclStubs *)pkgData;
if (tclStubsPtr->hooks) {
tclPlatStubsPtr = tclStubsPtr->hooks->tclPlatStubs;