summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2012-12-13 12:14:37 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2012-12-13 12:14:37 (GMT)
commit72da5b18e878aeb9744fa4b746b646eb98e750cd (patch)
treee95c977d9cf78e7e37dbae3a9bd401a34b8368f5
parent9cda5f1b85ae1e084ee0b6b5299557afb670ad70 (diff)
parenta7a35f9dd069a28ee71c5b3c05293633a77c0f12 (diff)
downloadtcl-72da5b18e878aeb9744fa4b746b646eb98e750cd.zip
tcl-72da5b18e878aeb9744fa4b746b646eb98e750cd.tar.gz
tcl-72da5b18e878aeb9744fa4b746b646eb98e750cd.tar.bz2
Changelog entry, and change macro variable to not conflict with possible outside variable names
-rw-r--r--ChangeLog5
-rw-r--r--generic/tcl.h6
2 files changed, 8 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 9beccc7..87f0260 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-12-13 Jan Nijtmans <nijtmans@users.sf.net>
+
+ * generic/tcl.h: Fix Tcl_DecrRefCount macro such that it
+ doesn't access its objPtr parameter twice any more.
+
2012-12-10 Donal K. Fellows <dkf@users.sf.net>
* tools/tcltk-man2html.tcl (plus-pkgs): Increased robustness of
diff --git a/generic/tcl.h b/generic/tcl.h
index 5a85c33..129a044 100644
--- a/generic/tcl.h
+++ b/generic/tcl.h
@@ -2502,9 +2502,9 @@ EXTERN void Tcl_GetMemoryInfo(Tcl_DString *dsPtr);
*/
# define Tcl_DecrRefCount(objPtr) \
do { \
- Tcl_Obj *obj = (objPtr); \
- if ((obj)->refCount-- < 2) { \
- TclFreeObj(obj); \
+ Tcl_Obj *_objPtr = (objPtr); \
+ if (_objPtr->refCount-- < 2) { \
+ TclFreeObj(_objPtr); \
} \
} while(0)
# define Tcl_IsShared(objPtr) \