From 8a539b981722705710128c18bb03787afa71847f Mon Sep 17 00:00:00 2001 From: dkf Date: Fri, 15 Jun 2012 07:55:16 +0000 Subject: [Bug 3535362]: Changed name of 'unshare' internal function to avoid clash with some libc versions. --- ChangeLog | 5 +++++ generic/ttk/ttkTreeview.c | 8 ++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index c5bee52..17aaf28 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2012-06-15 Donal K. Fellows + + * generic/ttk/ttkTreeview.c (unshareObj): [Bug 3535362]: Changed name + of 'unshare' internal function to avoid clash with some libc versions. + 2012-06-12 Donal K. Fellows * unix/tkUnixRFont.c (Tk_DrawChars, TkUnixSetXftClipRegion): Add some diff --git a/generic/ttk/ttkTreeview.c b/generic/ttk/ttkTreeview.c index 222b280..6b9042f 100644 --- a/generic/ttk/ttkTreeview.c +++ b/generic/ttk/ttkTreeview.c @@ -485,11 +485,11 @@ static void foreachHashEntry(Tcl_HashTable *ht, HashEntryIterator func) } } -/* + unshare(objPtr) -- +/* + unshareObj(objPtr) -- * Ensure that a Tcl_Obj * has refcount 1 -- either return objPtr * itself, or a duplicated copy. */ -static Tcl_Obj *unshare(Tcl_Obj *objPtr) +static Tcl_Obj *unshareObj(Tcl_Obj *objPtr) { if (Tcl_IsShared(objPtr)) { Tcl_Obj *newObj = Tcl_DuplicateObj(objPtr); @@ -2525,7 +2525,7 @@ static int TreeviewSetCommand( } else { /* set column */ int length; - item->valuesObj = unshare(item->valuesObj); + item->valuesObj = unshareObj(item->valuesObj); /* Make sure -values is fully populated: */ @@ -2826,7 +2826,7 @@ static int TreeviewSeeCommand( */ for (parent = item->parent; parent; parent = parent->parent) { if (!(parent->state & TTK_STATE_OPEN)) { - parent->openObj = unshare(parent->openObj); + parent->openObj = unshareObj(parent->openObj); Tcl_SetBooleanObj(parent->openObj, 1); parent->state |= TTK_STATE_OPEN; TtkRedisplayWidget(&tv->core); -- cgit v0.12