Index: generic/nsfDebug.c
===================================================================
diff -u -re48161ab167236344f7d23da3e855c31d1a1ebc7 -r9f2bb394fca71a456c6e9e8135e493625f8edecf
--- generic/nsfDebug.c	(.../nsfDebug.c)	(revision e48161ab167236344f7d23da3e855c31d1a1ebc7)
+++ generic/nsfDebug.c	(.../nsfDebug.c)	(revision 9f2bb394fca71a456c6e9e8135e493625f8edecf)
@@ -132,7 +132,7 @@
       fprintf(stderr, "caller %p ", (void *)Tcl_CallFrame_callerPtr(f));
       fprintf(stderr, "callerV %p ", (void *)Tcl_CallFrame_callerVarPtr(f));
       Tcl_GetCommandFullName(interp, (Tcl_Command)f->procPtr->cmdPtr, cmdObj);
-      fprintf(stderr, "%s (%p) lvl=%li\n", ObjStr(cmdObj), (void *)f->procPtr->cmdPtr,
+      fprintf(stderr, "%s (%p) lvl=%lu\n", ObjStr(cmdObj), (void *)f->procPtr->cmdPtr,
               (unsigned long)f->level);
     } else {
         if (f->varTablePtr != NULL) {
Index: generic/nsfPointer.c
===================================================================
diff -u -re48161ab167236344f7d23da3e855c31d1a1ebc7 -r9f2bb394fca71a456c6e9e8135e493625f8edecf
--- generic/nsfPointer.c	(.../nsfPointer.c)	(revision e48161ab167236344f7d23da3e855c31d1a1ebc7)
+++ generic/nsfPointer.c	(.../nsfPointer.c)	(revision 9f2bb394fca71a456c6e9e8135e493625f8edecf)
@@ -153,10 +153,10 @@
  *
  *----------------------------------------------------------------------
  */
-static Tcl_HashEntry * Nsf_PointerGetHptr(void *valuePtr) nonnull(1);
+static Tcl_HashEntry * Nsf_PointerGetHptr(const void *valuePtr) nonnull(1);
 
 static Tcl_HashEntry *
-Nsf_PointerGetHptr(void *valuePtr) {
+Nsf_PointerGetHptr(const void *valuePtr) {
   Tcl_HashEntry *hPtr;
   Tcl_HashSearch hSrch;