Index: generic/nsfObj.c
===================================================================
diff -u -r745c46b4619253f283fe4285d1f4a83375e3d9d7 -r10f06c20b9fe60805fd945e7caa4133784fa62ad
--- generic/nsfObj.c	(.../nsfObj.c)	(revision 745c46b4619253f283fe4285d1f4a83375e3d9d7)
+++ generic/nsfObj.c	(.../nsfObj.c)	(revision 10f06c20b9fe60805fd945e7caa4133784fa62ad)
@@ -487,8 +487,9 @@
     Tcl_Obj *objPtr	/* The object to convert. */
 ) {
   NsfClass  *mixin = NULL;
-  TCL_OBJC_T        oc, result;
+  TCL_SIZE_T oc;
   Tcl_Obj  **ov;
+  int        result;
 
   result = Tcl_ListObjGetElements(interp, objPtr, &oc, &ov);
   if (likely(result == TCL_OK)) {
@@ -646,8 +647,9 @@
     Tcl_Interp *interp,
     Tcl_Obj *obj
 ) {
-  int i, result, oc = 0;
-  Tcl_Obj **objv;
+  Tcl_Obj  **objv;
+  TCL_SIZE_T oc, i;
+  int        result;
 
   result = Tcl_ListObjGetElements(interp, obj, &oc, &objv);
 
@@ -793,7 +795,8 @@
 ) {
   Tcl_Obj *guardObj = NULL, *filterObj;
   Filterreg *filterregPtr;
-  TCL_OBJC_T oc; Tcl_Obj **ov;
+  TCL_SIZE_T oc;
+  Tcl_Obj  **ov;
 
   if (Tcl_ListObjGetElements(interp, objPtr, &oc, &ov) == TCL_OK) {
     if (oc == 1) {