Index: generic/nsfInt.h
===================================================================
diff -u -r38a23bc39ddb9a415b70b39d98b42a8891155cfb -r64c08fef023b96fa1272ec177961a19c5312e29a
--- generic/nsfInt.h	(.../nsfInt.h)	(revision 38a23bc39ddb9a415b70b39d98b42a8891155cfb)
+++ generic/nsfInt.h	(.../nsfInt.h)	(revision 64c08fef023b96fa1272ec177961a19c5312e29a)
@@ -254,8 +254,8 @@
   MEM_COUNT_ALLOC("INCR_REF_COUNT-" name,A); Tcl_IncrRefCount(A)
 
 #define ObjStr(obj) (obj)->bytes ? (obj)->bytes : Tcl_GetString(obj)
-#define ClassName(cl) (((cl) ? ObjStr(cl->object.cmdName) : "NULL"))
-#define ObjectName(obj) (((obj) ? ObjStr(obj->cmdName) : "NULL"))
+#define ClassName(cl) (((cl) ? ObjStr((cl)->object.cmdName) : "NULL"))
+#define ObjectName(obj) (((obj) ? ObjStr((obj)->cmdName) : "NULL"))
 
 #ifdef OBJDELETION_TRACE
 # define PRINTOBJ(ctx,obj) \