The Tcl 9.0 way of how [dfc08326e3] should be fixed: Real integration of TclOO in Tcl means that calling the function Tcl_OOInitStubs() should be elminated in full. This branch shows how to do that.rfe_dfc08326e3

1 files changed, 13 insertions, 0 deletions

diff --git a/generic/tclStubLib.c b/generic/tclStubLib.c
index 3e4a5ae..6487ebb 100644
--- a/generic/tclStubLib.c
+++ b/generic/tclStubLib.c
@@ -12,16 +12,21 @@
  */
 
 #include "tclInt.h"
+#include "tclOOInt.h"
 
 MODULE_SCOPE const TclStubs *tclStubsPtr;
 MODULE_SCOPE const TclPlatStubs *tclPlatStubsPtr;
 MODULE_SCOPE const TclIntStubs *tclIntStubsPtr;
 MODULE_SCOPE const TclIntPlatStubs *tclIntPlatStubsPtr;
+MODULE_SCOPE const TclOOStubs *tclOOStubsPtr;
+MODULE_SCOPE const TclOOIntStubs *tclOOIntStubsPtr;
 
 const TclStubs *tclStubsPtr = NULL;
 const TclPlatStubs *tclPlatStubsPtr = NULL;
 const TclIntStubs *tclIntStubsPtr = NULL;
 const TclIntPlatStubs *tclIntPlatStubsPtr = NULL;
+const TclOOStubs *tclOOStubsPtr = NULL;
+const TclOOIntStubs *tclOOIntStubsPtr = NULL;
 
 /*
  * Use our own ISDIGIT to avoid linking to libc on windows
@@ -113,10 +118,18 @@ Tcl_InitStubs(
 	tclPlatStubsPtr = stubsPtr->hooks->tclPlatStubs;
 	tclIntStubsPtr = stubsPtr->hooks->tclIntStubs;
 	tclIntPlatStubsPtr = stubsPtr->hooks->tclIntPlatStubs;
+	tclOOStubsPtr = stubsPtr->hooks->tclOOStubs;
+	if (tclOOStubsPtr && tclOOStubsPtr->hooks) {
+	    tclOOIntStubsPtr = tclOOStubsPtr->hooks->tclOOIntStubs;
+	} else {
+	    tclOOIntStubsPtr = NULL;
+	}
     } else {
 	tclPlatStubsPtr = NULL;
 	tclIntStubsPtr = NULL;
 	tclIntPlatStubsPtr = NULL;
+	tclOOStubsPtr = NULL;
+	tclOOIntStubsPtr = NULL;
     }
 
     return actualVersion;