1 files changed, 46 insertions, 80 deletions

diff --git a/generic/tclStubLib.c b/generic/tclStubLib.c
index f569820..1ab7ff3 100644
--- a/generic/tclStubLib.c
+++ b/generic/tclStubLib.c
@@ -1,73 +1,69 @@
-/*
+/* 
  * tclStubLib.c --
  *
- *	Stub object that will be statically linked into extensions that want
+ *	Stub object that will be statically linked into extensions that wish
  *	to access Tcl.
  *
  * Copyright (c) 1998-1999 by Scriptics Corporation.
  * Copyright (c) 1998 Paul Duffin.
  *
- * See the file "license.terms" for information on usage and redistribution of
- * this file, and for a DISCLAIMER OF ALL WARRANTIES.
+ * See the file "license.terms" for information on usage and redistribution
+ * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  */
 
 /*
- * We need to ensure that we use the stub macros so that this file contains no
- * references to any of the stub functions. This will make it possible to
- * build an extension that references Tcl_InitStubs but doesn't end up
+ * We need to ensure that we use the stub macros so that this file contains
+ * no references to any of the stub functions.  This will make it possible
+ * to build an extension that references Tcl_InitStubs but doesn't end up
  * including the rest of the stub functions.
  */
 
+#ifndef USE_TCL_STUBS
 #define USE_TCL_STUBS
+#endif
+#undef USE_TCL_STUB_PROCS
 
 #include "tclInt.h"
+#include "tclPort.h"
 
-MODULE_SCOPE const TclStubs *tclStubsPtr;
-MODULE_SCOPE const TclPlatStubs *tclPlatStubsPtr;
-MODULE_SCOPE const TclIntStubs *tclIntStubsPtr;
-MODULE_SCOPE const TclIntPlatStubs *tclIntPlatStubsPtr;
+/*
+ * Ensure that Tcl_InitStubs is built as an exported symbol.  The other stub
+ * functions should be built as non-exported symbols.
+ */
 
-const TclStubs *tclStubsPtr = NULL;
-const TclPlatStubs *tclPlatStubsPtr = NULL;
-const TclIntStubs *tclIntStubsPtr = NULL;
-const TclIntPlatStubs *tclIntPlatStubsPtr = NULL;
+TclStubs *tclStubsPtr = NULL;
+TclPlatStubs *tclPlatStubsPtr = NULL;
+TclIntStubs *tclIntStubsPtr = NULL;
+TclIntPlatStubs *tclIntPlatStubsPtr = NULL;
 
-static const TclStubs *
-HasStubSupport(
-    Tcl_Interp *interp)
+static TclStubs *	HasStubSupport _ANSI_ARGS_((Tcl_Interp *interp));
+
+static TclStubs *
+HasStubSupport (interp)
+    Tcl_Interp *interp;
 {
     Interp *iPtr = (Interp *) interp;
 
     if (iPtr->stubTable && (iPtr->stubTable->magic == TCL_STUB_MAGIC)) {
 	return iPtr->stubTable;
     }
+    interp->result = "This interpreter does not support stubs-enabled extensions.";
+    interp->freeProc = TCL_STATIC;
 
-    iPtr->result =
-	    (char *)"This interpreter does not support stubs-enabled extensions.";
-    iPtr->freeProc = TCL_STATIC;
     return NULL;
 }
 
 /*
- * Use our own isdigit to avoid linking to libc on windows
- */
-
-static int isDigit(const int c)
-{
-    return (c >= '0' && c <= '9');
-}
-
-/*
  *----------------------------------------------------------------------
  *
  * Tcl_InitStubs --
  *
- *	Tries to initialise the stub table pointers and ensures that the
- *	correct version of Tcl is loaded.
+ *	Tries to initialise the stub table pointers and ensures that
+ *	the correct version of Tcl is loaded.
  *
  * Results:
- *	The actual version of Tcl that satisfies the request, or NULL to
- *	indicate that an error occurred.
+ *	The actual version of Tcl that satisfies the request, or
+ *	NULL to indicate that an error occurred.
  *
  * Side effects:
  *	Sets the stub table pointers.
@@ -75,19 +71,23 @@ static int isDigit(const int c)
  *----------------------------------------------------------------------
  */
 
-MODULE_SCOPE const char *
-Tcl_InitStubs(
-    Tcl_Interp *interp,
-    const char *version,
-    int exact)
+#ifdef Tcl_InitStubs
+#undef Tcl_InitStubs
+#endif
+
+CONST char *
+Tcl_InitStubs (interp, version, exact)
+    Tcl_Interp *interp;
+    CONST char *version;
+    int exact;
 {
-    const char *actualVersion = NULL;
+    CONST char *actualVersion = NULL;
     ClientData pkgData = NULL;
 
     /*
-     * We can't optimize this check by caching tclStubsPtr because that
-     * prevents apps from being able to load/unload Tcl dynamically multiple
-     * times. [Bug 615304]
+     * We can't optimize this check by caching tclStubsPtr because
+     * that prevents apps from being able to load/unload Tcl dynamically
+     * multiple times. [Bug 615304]
      */
 
     tclStubsPtr = HasStubSupport(interp);
@@ -95,37 +95,11 @@ Tcl_InitStubs(
 	return NULL;
     }
 
-    actualVersion = Tcl_PkgRequireEx(interp, "Tcl", version, 0, &pkgData);
+    actualVersion = Tcl_PkgRequireEx(interp, "Tcl", version, exact, &pkgData);
     if (actualVersion == NULL) {
 	return NULL;
     }
-    if (exact) {
-	const char *p = version;
-	int count = 0;
-
-	while (*p) {
-	    count += !isDigit(*p++);
-	}
-	if (count == 1) {
-	    const char *q = actualVersion;
-
-	    p = version;
-	    while (*p && (*p == *q)) {
-		p++; q++;
-	    }
-	    if (*p) {
-		/* Construct error message */
-		Tcl_PkgRequireEx(interp, "Tcl", version, 1, NULL);
-		return NULL;
-	    }
-	} else {
-	    actualVersion = Tcl_PkgRequireEx(interp, "Tcl", version, 1, NULL);
-	    if (actualVersion == NULL) {
-		return NULL;
-	    }
-	}
-    }
-    tclStubsPtr = (TclStubs *) pkgData;
+    tclStubsPtr = (TclStubs*)pkgData;
 
     if (tclStubsPtr->hooks) {
 	tclPlatStubsPtr = tclStubsPtr->hooks->tclPlatStubs;
@@ -136,14 +110,6 @@ Tcl_InitStubs(
 	tclIntStubsPtr = NULL;
 	tclIntPlatStubsPtr = NULL;
     }
-
+    
     return actualVersion;
 }
-
-/*
- * Local Variables:
- * mode: c
- * c-basic-offset: 4
- * fill-column: 78
- * End:
- */