diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-12-13 12:14:37 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-12-13 12:14:37 (GMT) |
| commit | 72da5b18e878aeb9744fa4b746b646eb98e750cd (patch) | |
| tree | e95c977d9cf78e7e37dbae3a9bd401a34b8368f5 | |
| parent | 9cda5f1b85ae1e084ee0b6b5299557afb670ad70 (diff) | |
| parent | a7a35f9dd069a28ee71c5b3c05293633a77c0f12 (diff) | |
| download | tcl-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-- | ChangeLog | 5 | ||||
| -rw-r--r-- | generic/tcl.h | 6 |
2 files changed, 8 insertions, 3 deletions
@@ -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) \ |