Index: generic/nsf.c
===================================================================
diff -u -r0922b668a76bea5759a546d821c13e6db8ef273e -r64ee56cdbf4f6d6e2d8b28b56a5a4634a54c5c5a
--- generic/nsf.c	(.../nsf.c)	(revision 0922b668a76bea5759a546d821c13e6db8ef273e)
+++ generic/nsf.c	(.../nsf.c)	(revision 64ee56cdbf4f6d6e2d8b28b56a5a4634a54c5c5a)
@@ -117,7 +117,7 @@
   ClientData          oldDeleteData;
   Tcl_CmdDeleteProc  *oldDeleteProc;
   NsfParamDefs       *paramDefs;
-  long               *colonLocalVarCache;
+  Nsf_Tcl_Size_t     *colonLocalVarCache;
   unsigned int        checkAlwaysFlag;
   Tcl_Namespace      *execNsPtr;
   Tcl_Obj            *returnsObj;
@@ -5061,7 +5061,7 @@
    * Allocate colonLocalVarCache in the proper size (keep space for a
    * terminating element).
    */
-  ctxPtr->colonLocalVarCache = NEW_ARRAY(long, nrColonVars+1);
+  ctxPtr->colonLocalVarCache = NEW_ARRAY(Nsf_Tcl_Size_t, nrColonVars+1);
   varNameObjPtr = &varFramePtr->localCachePtr->varName0;
 
   /*
@@ -5090,9 +5090,9 @@
 
         /* fprintf(stderr, ".. insert %s (%d) on pos %d; check j %d entries \n", localName, i, j, j); */
         for (k = 0; k < j; k++) {
-          int         cmp;
-          long        idx;
-          const char *cachedName;
+          int            cmp;
+          Nsf_Tcl_Size_t idx;
+          const char    *cachedName;
 
           idx = ctxPtr->colonLocalVarCache[k];
           cachedName = Tcl_GetStringFromObj(localNames[idx], &len);
@@ -5114,7 +5114,7 @@
             break;
           }
         }
-        ctxPtr->colonLocalVarCache[k] = (long)i;
+        ctxPtr->colonLocalVarCache[k] = i;
 
         j++;
         if (j == nrColonVars) {
@@ -5188,7 +5188,7 @@
       result = CompiledColonLocalsLookupBuildCache(varFramePtr, varName, nameLength, localNames, ctxPtr);
 
     } else {
-      long i, j;
+      Nsf_Tcl_Size_t i, j;
 
       /*
        * We have a colonLocalVarCache.
@@ -13128,7 +13128,7 @@
   }
   if (ctxPtr->colonLocalVarCache != NULL) {
     /*fprintf(stderr, "free colonLocalVarCache %p\n", (void*)ctxPtr->colonLocalVarCache);*/
-    FREE(long*, ctxPtr->colonLocalVarCache);
+    FREE(Nsf_Tcl_Size_t*, ctxPtr->colonLocalVarCache);
   }
   if (ctxPtr->returnsObj != NULL) {
     DECR_REF_COUNT2("returnsObj", ctxPtr->returnsObj);
Index: generic/nsf.h
===================================================================
diff -u -r19220221bb9b4fb2b5c39e630817b07161119a0b -r64ee56cdbf4f6d6e2d8b28b56a5a4634a54c5c5a
--- generic/nsf.h	(.../nsf.h)	(revision 19220221bb9b4fb2b5c39e630817b07161119a0b)
+++ generic/nsf.h	(.../nsf.h)	(revision 64ee56cdbf4f6d6e2d8b28b56a5a4634a54c5c5a)
@@ -102,6 +102,18 @@
 # define NRE
 #endif
 
+#ifdef PRE9
+typedef int Nsf_Tcl_Size_t;
+#else
+typedef Tcl_Size Nsf_Tcl_Size_t;
+#endif
+
+# define TCL_SIZE_T Nsf_Tcl_Size_t
+
+#ifndef TCL_INDEX_NONE
+# define TCL_INDEX_NONE -1
+#endif
+
 #ifndef NS_TCL_HAVE_TIP629
 # define TCL_OBJC_T           int
 # define TCL_OBJCMDPROC_T     Tcl_ObjCmdProc
@@ -133,12 +145,6 @@
 # endif
 #endif
 
-#ifdef PRE9
-# define TCL_SIZE_T int
-#else
-# define TCL_SIZE_T Tcl_Size
-#endif
-
 #ifndef TCL_INDEX_NONE
 # define TCL_INDEX_NONE -1
 #endif