Index: TODO
===================================================================
diff -u -re570f0508ee82bd7aeea0409c64855bb99ea5cee -r6406c7429413f2fe2b76fa82f8c2b4386794ba07
--- TODO	(.../TODO)	(revision e570f0508ee82bd7aeea0409c64855bb99ea5cee)
+++ TODO	(.../TODO)	(revision 6406c7429413f2fe2b76fa82f8c2b4386794ba07)
@@ -2810,6 +2810,10 @@
   * included "delete method"
   * included "delete attribute"
 
+- nsf.c: changes to use trunk-branch with and without TclStackAlloc()
+- migration-guide: add third level to toc
+- fix regression test for 8.6 to use nx prefix
+
 TODO:
 
 - add "link" form 2.4 (parameters) to "info parameters"
Index: generic/nsfInt.h
===================================================================
diff -u -r5972bd087afec6d23d1192d552a29c92e570d8a6 -r6406c7429413f2fe2b76fa82f8c2b4386794ba07
--- generic/nsfInt.h	(.../nsfInt.h)	(revision 5972bd087afec6d23d1192d552a29c92e570d8a6)
+++ generic/nsfInt.h	(.../nsfInt.h)	(revision 6406c7429413f2fe2b76fa82f8c2b4386794ba07)
@@ -696,8 +696,10 @@
 
 #if defined(NRE_SANE_PATCH)
 # define NsfNRRunCallbacks(interp, result, rootPtr) TclNRRunCallbacks(interp, result, rootPtr)
-# define TclStackFree(interp, ptr) ckfree(ptr)
-# define TclStackAlloc(interp, size) ckalloc(size)
+# if !defined(TclStackFree)
+#   define TclStackFree(interp, ptr) ckfree(ptr)
+#   define TclStackAlloc(interp, size) ckalloc(size)
+# endif
 #else
 # define NsfNRRunCallbacks(interp, result, rootPtr) TclNRRunCallbacks(interp, result, rootPtr, 0)
 # define TEOV_callback NRE_callback