Merge core-8-branch

1 files changed, 9 insertions, 29 deletions

diff --git a/generic/tclInt.h b/generic/tclInt.h
index 0eecfb3..fc86c21 100644
--- a/generic/tclInt.h
+++ b/generic/tclInt.h
@@ -1691,18 +1691,18 @@ typedef struct Command {
 /*
  * Flag bits for commands.
  *
- * CMD_DYING -			If 1 the command is in the process of
+ * CMD_IS_DELETED -		Means that the command is in the process of
  *				being deleted (its deleteProc is currently
  *				executing). Other attempts to delete the
  *				command should be ignored.
- * CMD_TRACE_ACTIVE -		If 1 the trace processing is currently
+ * CMD_TRACE_ACTIVE -		1 means that trace processing is currently
  *				underway for a rename/delete change. See the
  *				two flags below for which is currently being
  *				processed.
- * CMD_HAS_EXEC_TRACES -	If 1 means that this command has at least one
+ * CMD_HAS_EXEC_TRACES -	1 means that this command has at least one
  *				execution trace (as opposed to simple
  *				delete/rename traces) in its tracePtr list.
- * CMD_COMPILES_EXPANDED -	If 1 this command has a compiler that
+ * CMD_COMPILES_EXPANDED -	1 means that this command has a compiler that
  *				can handle expansion (provided it is not the
  *				first word).
  * TCL_TRACE_RENAME -		A rename trace is in progress. Further
@@ -1712,7 +1712,7 @@ typedef struct Command {
  * (these last two flags are defined in tcl.h)
  */
 
-#define CMD_DYING		    0x01
+#define CMD_IS_DELETED		    0x01
 #define CMD_TRACE_ACTIVE	    0x02
 #define CMD_HAS_EXEC_TRACES	    0x04
 #define CMD_COMPILES_EXPANDED	    0x08
@@ -4910,30 +4910,10 @@ MODULE_SCOPE Tcl_PackageInitProc Procbodytest_SafeInit;
  * the internal stubs, but the core can use the macro instead.
  */
 
-#define TclCleanupCommandMacro(cmdPtr)		\
-    do {					\
-	if ((cmdPtr)->refCount-- <= 1) {	\
-	    Tcl_Free(cmdPtr);			\
-	}					\
-    } while (0)
-
-
-/*
- * inside this routine increment refCount first incase cmdPtr is replacing itself
- */
-#define TclRoutineAssign(location, cmdPtr)	    \
-    do {					    \
-	(cmdPtr)->refCount++;			    \
-	if ((location) != NULL			    \
-	    && (location--) <= 1) {		    \
-	    Tcl_Free(((location)));		    \
-	}					    \
-	(location) = (cmdPtr);			    \
-    } while (0)
-    
-
-#define TclRoutineHasName(cmdPtr) \
-    ((cmdPtr)->hPtr != NULL)
+#define TclCleanupCommandMacro(cmdPtr) \
+    if ((cmdPtr)->refCount-- <= 1) { \
+	ckfree(cmdPtr);\
+    }
 
 /*
  *----------------------------------------------------------------