Index: generic/stubs9.0/nsfDecls.h
===================================================================
diff -u -re48161ab167236344f7d23da3e855c31d1a1ebc7 -r745c46b4619253f283fe4285d1f4a83375e3d9d7
--- generic/stubs9.0/nsfDecls.h	(.../nsfDecls.h)	(revision e48161ab167236344f7d23da3e855c31d1a1ebc7)
+++ generic/stubs9.0/nsfDecls.h	(.../nsfDecls.h)	(revision 745c46b4619253f283fe4285d1f4a83375e3d9d7)
@@ -127,29 +127,29 @@
 /* 21 */
 EXTERN int		NsfCallMethodWithArgs(Tcl_Interp *interp,
 				Nsf_Object *object, Tcl_Obj *methodObj,
-				Tcl_Obj *arg1, int givenObjc,
+				Tcl_Obj *arg1, TCL_OBJC_T givenObjc,
 				Tcl_Obj *const objv[], unsigned int flags);
 /* 22 */
 EXTERN int		NsfAddObjectMethod(Tcl_Interp *interp,
 				struct Nsf_Object *object,
-				const char *methodName, Tcl_ObjCmdProc *proc,
+				const char *methodName, TCL_OBJCMDPROC_T *proc,
 				ClientData clientData, Tcl_CmdDeleteProc *dp,
 				unsigned int flags);
 /* 23 */
 EXTERN int		NsfAddClassMethod(Tcl_Interp *interp,
 				struct Nsf_Class *class,
-				const char *methodName, Tcl_ObjCmdProc *proc,
+				const char *methodName, TCL_OBJCMDPROC_T *proc,
 				ClientData clientData, Tcl_CmdDeleteProc *dp,
 				unsigned int flags);
 /* 24 */
 EXTERN int		NsfCreate(Tcl_Interp *interp, Nsf_Class *class,
-				Tcl_Obj *nameObj, int objc,
+				Tcl_Obj *nameObj, TCL_OBJC_T objc,
 				Tcl_Obj *const objv[]);
 /* 25 */
-EXTERN int		Nsf_ArgumentParse(Tcl_Interp *interp, int objc,
+EXTERN int		Nsf_ArgumentParse(Tcl_Interp *interp, TCL_OBJC_T objc,
 				Tcl_Obj *const objv[], Nsf_Object *object,
 				Tcl_Obj *procNameObj,
-				Nsf_Param const *paramPtr, int nrParams,
+				Nsf_Param const *paramPtr, TCL_OBJC_T nrParams,
 				int serial, unsigned int processFlags,
 				Nsf_ParseContext *pcPtr);
 /* 26 */
@@ -241,11 +241,11 @@
     void (*nsfSetClassClientData) (Tcl_Interp *interp, Nsf_Class *cl, ClientData data); /* 18 */
     ClientData (*nsfGetClassClientData) (Tcl_Interp *interp, Nsf_Class *cl); /* 19 */
     void (*nsfRequireObjNamespace) (Tcl_Interp *interp, Nsf_Object *object); /* 20 */
-    int (*nsfCallMethodWithArgs) (Tcl_Interp *interp, Nsf_Object *object, Tcl_Obj *methodObj, Tcl_Obj *arg1, int givenObjc, Tcl_Obj *const objv[], unsigned int flags); /* 21 */
-    int (*nsfAddObjectMethod) (Tcl_Interp *interp, struct Nsf_Object *object, const char *methodName, Tcl_ObjCmdProc *proc, ClientData clientData, Tcl_CmdDeleteProc *dp, unsigned int flags); /* 22 */
-    int (*nsfAddClassMethod) (Tcl_Interp *interp, struct Nsf_Class *class, const char *methodName, Tcl_ObjCmdProc *proc, ClientData clientData, Tcl_CmdDeleteProc *dp, unsigned int flags); /* 23 */
-    int (*nsfCreate) (Tcl_Interp *interp, Nsf_Class *class, Tcl_Obj *nameObj, int objc, Tcl_Obj *const objv[]); /* 24 */
-    int (*nsf_ArgumentParse) (Tcl_Interp *interp, int objc, Tcl_Obj *const objv[], Nsf_Object *object, Tcl_Obj *procNameObj, Nsf_Param const *paramPtr, int nrParams, int serial, unsigned int processFlags, Nsf_ParseContext *pcPtr); /* 25 */
+    int (*nsfCallMethodWithArgs) (Tcl_Interp *interp, Nsf_Object *object, Tcl_Obj *methodObj, Tcl_Obj *arg1, TCL_OBJC_T givenObjc, Tcl_Obj *const objv[], unsigned int flags); /* 21 */
+    int (*nsfAddObjectMethod) (Tcl_Interp *interp, struct Nsf_Object *object, const char *methodName, TCL_OBJCMDPROC_T *proc, ClientData clientData, Tcl_CmdDeleteProc *dp, unsigned int flags); /* 22 */
+    int (*nsfAddClassMethod) (Tcl_Interp *interp, struct Nsf_Class *class, const char *methodName, TCL_OBJCMDPROC_T *proc, ClientData clientData, Tcl_CmdDeleteProc *dp, unsigned int flags); /* 23 */
+    int (*nsfCreate) (Tcl_Interp *interp, Nsf_Class *class, Tcl_Obj *nameObj, TCL_OBJC_T objc, Tcl_Obj *const objv[]); /* 24 */
+    int (*nsf_ArgumentParse) (Tcl_Interp *interp, TCL_OBJC_T objc, Tcl_Obj *const objv[], Nsf_Object *object, Tcl_Obj *procNameObj, Nsf_Param const *paramPtr, TCL_OBJC_T nrParams, int serial, unsigned int processFlags, Nsf_ParseContext *pcPtr); /* 25 */
     void (*nsfLog) (Tcl_Interp *interp, int requiredLevel, const char *fmt, ...); /* 26 */
     int (*nsf_PointerAdd) (Tcl_Interp *interp, char *buffer, size_t size, const char *typeName, void *valuePtr); /* 27 */
     int (*nsf_PointerDelete) (const char *key, void *valuePtr, int free); /* 28 */