diff options
author | das <das> | 2008-06-12 06:29:14 (GMT) |
---|---|---|
committer | das <das> | 2008-06-12 06:29:14 (GMT) |
commit | 3e497c1f548a8cbba7c7211b72f9b476f4093355 (patch) | |
tree | 51011188377a8200015fe034379e37100688c9a5 /generic/tclOOStubLib.c | |
parent | 478314cd955802ff15753a226ac6a1e7ee7d73d8 (diff) | |
download | tcl-3e497c1f548a8cbba7c7211b72f9b476f4093355.zip tcl-3e497c1f548a8cbba7c7211b72f9b476f4093355.tar.gz tcl-3e497c1f548a8cbba7c7211b72f9b476f4093355.tar.bz2 |
* generic/tclOO.c: use TclOOStubs hooks field to retrieve
* generic/tclOODecls.h: TclOOIntStubs pointer. [Bug 1980953]
* generic/tclOOIntDecls.h:
* generic/tclOOStubInit.c:
* generic/tclOOStubLib.c:
Diffstat (limited to 'generic/tclOOStubLib.c')
-rw-r--r-- | generic/tclOOStubLib.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/generic/tclOOStubLib.c b/generic/tclOOStubLib.c index 280854b..0414ae4 100644 --- a/generic/tclOOStubLib.c +++ b/generic/tclOOStubLib.c @@ -1,5 +1,5 @@ /* - * $Id: tclOOStubLib.c,v 1.3 2008/06/01 00:33:05 dkf Exp $ + * $Id: tclOOStubLib.c,v 1.4 2008/06/12 06:29:18 das Exp $ * ORIGINAL SOURCE: tk/generic/tkStubLib.c, version 1.9 2004/03/17 */ @@ -53,16 +53,16 @@ TclOOInitializeStubs( ClientData clientData = NULL; const char *actualVersion = Tcl_PkgRequireEx(interp, packageName,version, exact, &clientData); - struct TclOOStubAPI *stubsAPIPtr = clientData; - if (stubsAPIPtr == NULL) { + if (clientData == NULL) { Tcl_ResetResult(interp); Tcl_AppendResult(interp, "Error loading ", packageName, " package; ", "package not present or incomplete", NULL); return NULL; } else { - const TclOOStubs * const stubsPtr = stubsAPIPtr->stubsPtr; - const TclOOIntStubs * const intStubsPtr = stubsAPIPtr->intStubsPtr; + const TclOOStubs * const stubsPtr = clientData; + const TclOOIntStubs * const intStubsPtr = stubsPtr->hooks ? + stubsPtr->hooks->tclOOIntStubs : NULL; if (!actualVersion) { return NULL; |