Index: generic/nsfStack.c
===================================================================
diff -u -N -r286401d1ba226b1fa0b060c43d296f1bb56e1aa2 -r745c46b4619253f283fe4285d1f4a83375e3d9d7
--- generic/nsfStack.c	(.../nsfStack.c)	(revision 286401d1ba226b1fa0b060c43d296f1bb56e1aa2)
+++ generic/nsfStack.c	(.../nsfStack.c)	(revision 745c46b4619253f283fe4285d1f4a83375e3d9d7)
@@ -981,8 +981,8 @@
  */
 static Tcl_Obj*
 CallStackMethodPath(Tcl_Interp *interp, Tcl_CallFrame *framePtr) {
-  int      elements;
-  Tcl_Obj *resultObj, *methodPathObj = Tcl_NewListObj(0, NULL);
+  TCL_OBJC_T elements;
+  Tcl_Obj   *resultObj, *methodPathObj = Tcl_NewListObj(0, NULL);
 
   nonnull_assert(interp != NULL);
   nonnull_assert(framePtr != NULL);
@@ -1044,8 +1044,8 @@
    *  arguments, reverse the list to obtain the right order.
    */
   if (elements > 1) {
-    int       oc, i;
-    Tcl_Obj **ov;
+    TCL_OBJC_T oc, i;
+    Tcl_Obj  **ov;
 
     INCR_REF_COUNT(methodPathObj);
     Tcl_ListObjGetElements(interp, methodPathObj, &oc, &ov);
@@ -1241,9 +1241,9 @@
 static NsfCallStackContent *
 CscAlloc(Tcl_Interp *interp, NsfCallStackContent *cscPtr, const Tcl_Command cmd) {
 #if defined(NRE)
-  Tcl_ObjCmdProc *proc = (cmd != NULL) ? Tcl_Command_objProc(cmd) : NULL;
+  TCL_OBJCMDPROC_T *proc = (cmd != NULL) ? TCL_COMMAND_OBJPROC(cmd) : NULL;
 
-  if (proc == TclObjInterpProc) {
+  if (proc == (TCL_OBJCMDPROC_T*)TclObjInterpProc) {
     cscPtr = (NsfCallStackContent *) NsfTclStackAlloc(interp, sizeof(NsfCallStackContent), "csc");
     cscPtr->flags = NSF_CSC_CALL_IS_NRE;
   } else {