Index: generic/nsf.c
===================================================================
diff -u -r600bf6b005ff68be6f38c54dace2c8cc6b91882f -rbb72efa672030199bfaecff1cc829dfd802a28d8
--- generic/nsf.c	(.../nsf.c)	(revision 600bf6b005ff68be6f38c54dace2c8cc6b91882f)
+++ generic/nsf.c	(.../nsf.c)	(revision bb72efa672030199bfaecff1cc829dfd802a28d8)
@@ -71,7 +71,7 @@
 # if defined(PRE86)
 EXTERN NsfStubs nsfStubs;
 # else
-MODULE_SCOPE const NsfStubs * const nsfConstStubPtr;
+MODULE_SCOPE const NsfStubs nsfStubs;
 # endif
 #endif
 
@@ -25979,11 +25979,7 @@
 #ifndef AOL_SERVER
   /* the AOL server uses a different package loading mechanism */
 # ifdef COMPILE_NSF_STUBS
-#  if defined(PRE86)
   Tcl_PkgProvideEx(interp, "nsf", PACKAGE_VERSION, &nsfStubs);
-#  else
-  Tcl_PkgProvideEx(interp, "nsf", PACKAGE_VERSION, &nsfConstStubPtr);
-#  endif
 # else
   Tcl_PkgProvide(interp, "nsf", PACKAGE_VERSION);
 # endif
Index: generic/nsfStubInit.c
===================================================================
diff -u -r68b3924a7a90d28e2e11f9b9b8244a85da708073 -rbb72efa672030199bfaecff1cc829dfd802a28d8
--- generic/nsfStubInit.c	(.../nsfStubInit.c)	(revision 68b3924a7a90d28e2e11f9b9b8244a85da708073)
+++ generic/nsfStubInit.c	(.../nsfStubInit.c)	(revision bb72efa672030199bfaecff1cc829dfd802a28d8)
@@ -23,6 +23,15 @@
  * below should be made in the generic/tcl.decls script.
  */
 
+#if defined(PRE86)
+EXTERN NsfStubs nsfStubs;
+# else
+MODULE_SCOPE const NsfStubs nsfStubs;
+#endif
+
+
+
+
 /* !BEGIN!: Do not edit below this line. */
 
 NsfIntStubs nsfIntStubs = {
@@ -79,9 +88,6 @@
 
 /* !END!: Do not edit above this line. */
 
-MODULE_SCOPE const NsfStubs * const nsfConstStubPtr;
-const NsfStubs * const nsfConstStubPtr = &nsfStubs;
-
 /*
  * Local Variables:
  * mode: c
Index: generic/nsfStubLib.c
===================================================================
diff -u -r8912d7b95ef94a84884eabfec1ddbdb05a01387a -rbb72efa672030199bfaecff1cc829dfd802a28d8
--- generic/nsfStubLib.c	(.../nsfStubLib.c)	(revision 8912d7b95ef94a84884eabfec1ddbdb05a01387a)
+++ generic/nsfStubLib.c	(.../nsfStubLib.c)	(revision bb72efa672030199bfaecff1cc829dfd802a28d8)
@@ -92,6 +92,7 @@
 
       if (!stubsPtr || !intStubsPtr) {
         static char *errMsg = "missing stub table pointer";
+
         Tcl_ResetResult(interp);
         Tcl_AppendResult(interp, "Error loading package", packageName,
                          ": (requested version '", version, "', loaded version '",