summaryrefslogtreecommitdiffstats
path: root/generic
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2014-02-06 22:41:14 (GMT)
committerdgp <dgp@users.sourceforge.net>2014-02-06 22:41:14 (GMT)
commit32a6fce0618ed21d85cf47b4b842ea9ee2c0c2e6 (patch)
tree5843a23d0061df662d35b33e071a7dcb29698472 /generic
parent6e78f7a617b001eb5e35fe11cad2f469c0f48320 (diff)
downloadtcl-32a6fce0618ed21d85cf47b4b842ea9ee2c0c2e6.zip
tcl-32a6fce0618ed21d85cf47b4b842ea9ee2c0c2e6.tar.gz
tcl-32a6fce0618ed21d85cf47b4b842ea9ee2c0c2e6.tar.bz2
Change the flag value to avoid merge conflict with trunk.
Diffstat (limited to 'generic')
-rw-r--r--generic/tclInt.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/generic/tclInt.h b/generic/tclInt.h
index f869ff0..1348340 100644
--- a/generic/tclInt.h
+++ b/generic/tclInt.h
@@ -1528,7 +1528,7 @@ typedef struct Command {
#define CMD_IS_DELETED 0x1
#define CMD_TRACE_ACTIVE 0x2
#define CMD_HAS_EXEC_TRACES 0x4
-#define CMD_REDEF_IN_PROGRESS 0x8
+#define CMD_REDEF_IN_PROGRESS 0x10
/*
*----------------------------------------------------------------