Index: generic/gentclAPI.tcl
===================================================================
diff -u -r91a7b7d13c9ad7bbf50deb591d1cf62a8607e9d3 -r745c46b4619253f283fe4285d1f4a83375e3d9d7
--- generic/gentclAPI.tcl	(.../gentclAPI.tcl)	(revision 91a7b7d13c9ad7bbf50deb591d1cf62a8607e9d3)
+++ generic/gentclAPI.tcl	(.../gentclAPI.tcl)	(revision 745c46b4619253f283fe4285d1f4a83375e3d9d7)
@@ -30,7 +30,7 @@
 #
 
 set ::converter ""
-set ::objCmdProc "(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv)"
+set ::objCmdProc "(ClientData clientData, Tcl_Interp *interp, TCL_OBJC_T objc, Tcl_Obj *const* objv)"
 
 proc convertername {type typename} {
   if {[info exists ::registeredConverter($type)]} {
@@ -278,14 +278,14 @@
         "args"       {
           set type "int "
           set calledArg "objc - pc.lastObjc, objv + pc.lastObjc"
-          lappend if "int trailingObjc" "Tcl_Obj *const* trailingObjv"
+          lappend if "TCL_OBJC_T trailingObjc" "Tcl_Obj *const* trailingObjv"
           set ifSet 1
           set cVar 0
         }
         "allargs" {
           set type "int "
           set calledArg "objc, objv"
-          lappend if "int objc" "Tcl_Obj *const* objv"
+          lappend if "TCL_OBJC_T objc" "Tcl_Obj *const* objv"
           set ifSet 1
           set cVar 0
         }
@@ -369,7 +369,7 @@
   }
   return [subst -nocommands {
 static int
-${stub}(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) {
+${stub}(ClientData clientData, Tcl_Interp *interp, TCL_OBJC_T objc, Tcl_Obj *const* objv) {
   ParseContext pc;
 $intro
   if (likely(ArgumentParse(interp, objc, objv, $obj, objv[0],
@@ -392,7 +392,7 @@
   if {$cleanup ne ""} {error "$stub cleanup code '$cleanup' must be empty"}
   return [subst -nocommands {
 static int
-${stub}(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) {
+${stub}(ClientData clientData, Tcl_Interp *interp, TCL_OBJC_T objc, Tcl_Obj *const* objv) {
 $intro
     $cDefs
 $pre