diff options
| author | dkf <donal.k.fellows@manchester.ac.uk> | 2012-06-15 07:57:47 (GMT) |
|---|---|---|
| committer | dkf <donal.k.fellows@manchester.ac.uk> | 2012-06-15 07:57:47 (GMT) |
| commit | 73efbdd7437046466f0696459ae7dd93aa632b3f (patch) | |
| tree | 2f73a1f8eb582e0ece855dc8a8e5515e22da3257 | |
| parent | c43656f1112d65797a75c26595a0c52ebc7af4eb (diff) | |
| parent | 8a539b981722705710128c18bb03787afa71847f (diff) | |
| download | tk-73efbdd7437046466f0696459ae7dd93aa632b3f.zip tk-73efbdd7437046466f0696459ae7dd93aa632b3f.tar.gz tk-73efbdd7437046466f0696459ae7dd93aa632b3f.tar.bz2 | |
[Bug 3535362]: Changed name of 'unshare' internal function to avoid clash with
some libc versions.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | generic/ttk/ttkTreeview.c | 8 |
2 files changed, 9 insertions, 4 deletions
@@ -1,3 +1,8 @@ +2012-06-15 Donal K. Fellows <dkf@users.sf.net> + + * 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 <dkf@users.sf.net> * unix/tkUnixRFont.c (Tk_DrawChars, TkUnixSetXftClipRegion): Add some diff --git a/generic/ttk/ttkTreeview.c b/generic/ttk/ttkTreeview.c index b17ae45..32dd183 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); @@ -2524,7 +2524,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: */ @@ -2825,7 +2825,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); |