Index: generic/nsf.decls
===================================================================
diff -u -N -r9d1dfb6417294dbdc13ce4d249931055f7bd5ef8 -rd78fa3ae8a45aef2fd40bae73e19dee9b5069e02
--- generic/nsf.decls	(.../nsf.decls)	(revision 9d1dfb6417294dbdc13ce4d249931055f7bd5ef8)
+++ generic/nsf.decls	(.../nsf.decls)	(revision d78fa3ae8a45aef2fd40bae73e19dee9b5069e02)
@@ -106,7 +106,7 @@
 declare 14 generic {
   int NsfObjErrType(Tcl_Interp *interp, const char *context, 
 		    Tcl_Obj *value, const char *type,
-		    Nsf_Param const *paramPtr)
+		    Nsf_Param const *NsfObjErrType)
 }
 declare 15 generic {
   void NsfStackDump (Tcl_Interp *interp)
Index: generic/stubs8.5/nsfDecls.h
===================================================================
diff -u -N -r9d1dfb6417294dbdc13ce4d249931055f7bd5ef8 -rd78fa3ae8a45aef2fd40bae73e19dee9b5069e02
--- generic/stubs8.5/nsfDecls.h	(.../nsfDecls.h)	(revision 9d1dfb6417294dbdc13ce4d249931055f7bd5ef8)
+++ generic/stubs8.5/nsfDecls.h	(.../nsfDecls.h)	(revision d78fa3ae8a45aef2fd40bae73e19dee9b5069e02)
@@ -146,7 +146,8 @@
 /* 14 */
 EXTERN int		NsfObjErrType(Tcl_Interp *interp,
 				CONST char *context, Tcl_Obj *value,
-				CONST char *type, Nsf_Param CONST *paramPtr);
+				CONST char *type,
+				Nsf_Param CONST *NsfObjErrType);
 #endif
 #ifndef NsfStackDump_TCL_DECLARED
 #define NsfStackDump_TCL_DECLARED
@@ -356,7 +357,7 @@
     void (*nsfDStringVPrintf) (Tcl_DString *dsPtr, CONST char *fmt, va_list argPtr); /* 11 */
     int (*nsfPrintError) (Tcl_Interp *interp, CONST char *fmt, ...); /* 12 */
     int (*nsfErrInProc) (Tcl_Interp *interp, Tcl_Obj *objName, Tcl_Obj *clName, CONST char *procName); /* 13 */
-    int (*nsfObjErrType) (Tcl_Interp *interp, CONST char *context, Tcl_Obj *value, CONST char *type, Nsf_Param CONST *paramPtr); /* 14 */
+    int (*nsfObjErrType) (Tcl_Interp *interp, CONST char *context, Tcl_Obj *value, CONST char *type, Nsf_Param CONST *NsfObjErrType); /* 14 */
     void (*nsfStackDump) (Tcl_Interp *interp); /* 15 */
     void (*nsfSetObjClientData) (Tcl_Interp *interp, Nsf_Object *object, ClientData data); /* 16 */
     ClientData (*nsfGetObjClientData) (Tcl_Interp *interp, Nsf_Object *object); /* 17 */
Index: generic/stubs8.6/nsfDecls.h
===================================================================
diff -u -N -r9d1dfb6417294dbdc13ce4d249931055f7bd5ef8 -rd78fa3ae8a45aef2fd40bae73e19dee9b5069e02
--- generic/stubs8.6/nsfDecls.h	(.../nsfDecls.h)	(revision 9d1dfb6417294dbdc13ce4d249931055f7bd5ef8)
+++ generic/stubs8.6/nsfDecls.h	(.../nsfDecls.h)	(revision d78fa3ae8a45aef2fd40bae73e19dee9b5069e02)
@@ -105,7 +105,8 @@
 /* 14 */
 EXTERN int		NsfObjErrType(Tcl_Interp *interp,
 				const char *context, Tcl_Obj *value,
-				const char *type, Nsf_Param const *paramPtr);
+				const char *type,
+				Nsf_Param const *NsfObjErrType);
 /* 15 */
 EXTERN void		NsfStackDump(Tcl_Interp *interp);
 /* 16 */
@@ -233,7 +234,7 @@
     void (*nsfDStringVPrintf) (Tcl_DString *dsPtr, const char *fmt, va_list argPtr); /* 11 */
     int (*nsfPrintError) (Tcl_Interp *interp, const char *fmt, ...); /* 12 */
     int (*nsfErrInProc) (Tcl_Interp *interp, Tcl_Obj *objName, Tcl_Obj *clName, const char *procName); /* 13 */
-    int (*nsfObjErrType) (Tcl_Interp *interp, const char *context, Tcl_Obj *value, const char *type, Nsf_Param const *paramPtr); /* 14 */
+    int (*nsfObjErrType) (Tcl_Interp *interp, const char *context, Tcl_Obj *value, const char *type, Nsf_Param const *NsfObjErrType); /* 14 */
     void (*nsfStackDump) (Tcl_Interp *interp); /* 15 */
     void (*nsfSetObjClientData) (Tcl_Interp *interp, Nsf_Object *object, ClientData data); /* 16 */
     ClientData (*nsfGetObjClientData) (Tcl_Interp *interp, Nsf_Object *object); /* 17 */
Index: generic/stubs8.7/nsfDecls.h
===================================================================
diff -u -N -r9d1dfb6417294dbdc13ce4d249931055f7bd5ef8 -rd78fa3ae8a45aef2fd40bae73e19dee9b5069e02
--- generic/stubs8.7/nsfDecls.h	(.../nsfDecls.h)	(revision 9d1dfb6417294dbdc13ce4d249931055f7bd5ef8)
+++ generic/stubs8.7/nsfDecls.h	(.../nsfDecls.h)	(revision d78fa3ae8a45aef2fd40bae73e19dee9b5069e02)
@@ -105,7 +105,8 @@
 /* 14 */
 EXTERN int		NsfObjErrType(Tcl_Interp *interp,
 				const char *context, Tcl_Obj *value,
-				const char *type, Nsf_Param const *paramPtr);
+				const char *type,
+				Nsf_Param const *NsfObjErrType);
 /* 15 */
 EXTERN void		NsfStackDump(Tcl_Interp *interp);
 /* 16 */
@@ -233,7 +234,7 @@
     void (*nsfDStringVPrintf) (Tcl_DString *dsPtr, const char *fmt, va_list argPtr); /* 11 */
     int (*nsfPrintError) (Tcl_Interp *interp, const char *fmt, ...); /* 12 */
     int (*nsfErrInProc) (Tcl_Interp *interp, Tcl_Obj *objName, Tcl_Obj *clName, const char *procName); /* 13 */
-    int (*nsfObjErrType) (Tcl_Interp *interp, const char *context, Tcl_Obj *value, const char *type, Nsf_Param const *paramPtr); /* 14 */
+    int (*nsfObjErrType) (Tcl_Interp *interp, const char *context, Tcl_Obj *value, const char *type, Nsf_Param const *NsfObjErrType); /* 14 */
     void (*nsfStackDump) (Tcl_Interp *interp); /* 15 */
     void (*nsfSetObjClientData) (Tcl_Interp *interp, Nsf_Object *object, ClientData data); /* 16 */
     ClientData (*nsfGetObjClientData) (Tcl_Interp *interp, Nsf_Object *object); /* 17 */