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