Index: generic/nsfDebug.c
===================================================================
diff -u -r0de05aaed50fced1cd80a9408560a38fb2454bcf -rb6f285f739dbbb1c0808759854e0dcfb020bbc2e
--- generic/nsfDebug.c	(.../nsfDebug.c)	(revision 0de05aaed50fced1cd80a9408560a38fb2454bcf)
+++ generic/nsfDebug.c	(.../nsfDebug.c)	(revision b6f285f739dbbb1c0808759854e0dcfb020bbc2e)
@@ -243,10 +243,8 @@
  *----------------------------------------------------------------------
  */
 
-void  NsfMemCountAlloc(char *id, void *p) nonnull(1);
-
 void
-NsfMemCountAlloc(char *id, void *p) {
+NsfMemCountAlloc(const char *id, const void *p) {
   int new, *tableInitialized;
   NsfMemCounter *entry;
   Tcl_HashTable *tablePtr = NsfMemCountGetTable(&tableInitialized);
@@ -294,10 +292,8 @@
  *----------------------------------------------------------------------
  */
 
-void NsfMemCountFree(const char *id, void *p) nonnull(1);
-
 void
-NsfMemCountFree(const char *id, void *p) {
+NsfMemCountFree(const char *id, const void *p) {
   NsfMemCounter *entry;
   int *tableInitialized;
   Tcl_HashTable *tablePtr = NsfMemCountGetTable(&tableInitialized);