Index: generic/nsfStubLib.c
===================================================================
diff -u -ra422e30cf3600a498fac637e16604693577f7802 -r8c0fd2cd2e86285486f0dde372524dff93605317
--- generic/nsfStubLib.c	(.../nsfStubLib.c)	(revision a422e30cf3600a498fac637e16604693577f7802)
+++ generic/nsfStubLib.c	(.../nsfStubLib.c)	(revision 8c0fd2cd2e86285486f0dde372524dff93605317)
@@ -69,12 +69,12 @@
 
 #if defined(PRE86)
 extern NsfStubs *nsfStubsPtr;
+NsfStubs *nsfStubsPtr = NULL;
+NsfIntStubs *nsfIntStubsPtr = NULL;
 #else
-//MODULE_SCOPE const NsfStubs *nsfStubsPtr;
-//MODULE_SCOPE const NsfIntStubs *nsfIntStubsPtr;
-#endif
 CONST86 NsfStubs *nsfStubsPtr = NULL;
 CONST86 NsfIntStubs *nsfIntStubsPtr = NULL;
+#endif
 
 
 /*
@@ -114,7 +114,11 @@
                      (char*) 0L);
     actualVersion = NULL;
   } else {
+#ifdef PRE86
+    NsfStubs *stubsPtr;
+#else
     CONST86 NsfStubs *stubsPtr;
+#endif
 
     if (actualVersion != NULL) {
 
@@ -127,8 +131,11 @@
                       packageName, version, actualVersion, errMsg);
         actualVersion = NULL;
       } else {
+#ifdef PRE86
+        NsfIntStubs *intStubsPtr;
+#else
         CONST86 NsfIntStubs *intStubsPtr;
-
+#endif
         intStubsPtr = stubsPtr->hooks->nsfIntStubs;
 
         nsfStubsPtr = stubsPtr;