Index: generic/nsf.c
===================================================================
diff -u -rf2bfddf1c09ca935f713b2f49bfb2ac6b6444783 -ra9ab0550e1539c78cbddfab60543540bd861f87c
--- generic/nsf.c	(.../nsf.c)	(revision f2bfddf1c09ca935f713b2f49bfb2ac6b6444783)
+++ generic/nsf.c	(.../nsf.c)	(revision a9ab0550e1539c78cbddfab60543540bd861f87c)
@@ -2230,7 +2230,7 @@
       const char  *alias_cmd_name, *qualifiedObjName;
       Tcl_Obj     *nameObj = objPtr;
       Tcl_Obj    **alias_ov;
-      int          alias_oc = 0;
+      TCL_OBJC_T   alias_oc = 0;
 
       if (!isAbsolutePath(objName)) {
         nameObj = NameInNamespaceObj(objName, CallingNameSpace(interp));
Index: generic/nsf.h
===================================================================
diff -u -ra24fe86a5ccd51ec670f30f1de1f2d2df7cde27e -ra9ab0550e1539c78cbddfab60543540bd861f87c
--- generic/nsf.h	(.../nsf.h)	(revision a24fe86a5ccd51ec670f30f1de1f2d2df7cde27e)
+++ generic/nsf.h	(.../nsf.h)	(revision a9ab0550e1539c78cbddfab60543540bd861f87c)
@@ -91,13 +91,19 @@
 #endif
 #endif
 
+#ifndef PRE9
+# define NS_TCL_HAVE_TIP629
+#endif
+
+
 #if defined(PRE86)
 # define Tcl_GetErrorLine(interp) (interp)->errorLine
 #else
 # define NRE
 #endif
 
 #ifndef NS_TCL_HAVE_TIP629
+no
 # define TCL_OBJC_T           int
 # define TCL_OBJCMDPROC_T     Tcl_ObjCmdProc
 # define TCL_CREATEOBJCOMMAND Tcl_CreateObjCommand