Index: generic/nsf.c
===================================================================
diff -u -rfdc8830eff0ef4987213bac5f99adbda08d87f81 -r884a4e033f0d9d93bf1e151dfe1be8cb074dad0f
--- generic/nsf.c	(.../nsf.c)	(revision fdc8830eff0ef4987213bac5f99adbda08d87f81)
+++ generic/nsf.c	(.../nsf.c)	(revision 884a4e033f0d9d93bf1e151dfe1be8cb074dad0f)
@@ -4239,7 +4239,7 @@
  * Variable resolvers
  *
  *********************************************************/
-#define FOR_COLON_RESOLVER(ptr) (*(ptr) == ':' && *(ptr+1) != ':')
+#define FOR_COLON_RESOLVER(ptr) (*(ptr) == ':' && *((ptr)+1) != ':')
 
 /*
  *----------------------------------------------------------------------
@@ -21112,7 +21112,7 @@
  */
 
 #define SkipNonposParamDefs(cPtr) \
-  for (; ++cPtr <= lastParamPtr && *cPtr->name == '-';)
+  for (; ++(cPtr) <= lastParamPtr && *(cPtr)->name == '-';)
 
 static int
 ArgumentParse(Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[],