[gentoo-commits] gentoo-x86 commit in dev-lang/tk/files: tk-8.5.11-fix-name-collision-uclibc.patch

[Anthony G. Basile (blueness)]

blueness    12/11/04 18:35:32

  Added:                tk-8.5.11-fix-name-collision-uclibc.patch
  Log:
  Patch 8.5.11 to build on uclibc, bug #441630
  
  (Portage version: 2.1.11.31/cvs/Linux x86_64, signed Manifest commit with key 0xF52D4BBA)

Revision  Changes    Path
1.1                  dev-lang/tk/files/tk-8.5.11-fix-name-collision-uclibc.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/tk/files/tk-8.5.11-fix-name-collision-uclibc.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/tk/files/tk-8.5.11-fix-name-collision-uclibc.patch?rev=1.1&content-type=text/plain

Index: tk-8.5.11-fix-name-collision-uclibc.patch
===================================================================
diff -Naur tk8.5.11.orig/generic/ttk/ttkTreeview.c tk8.5.11/generic/ttk/ttkTreeview.c
--- tk8.5.11.orig/generic/ttk/ttkTreeview.c	2011-11-01 10:05:27.000000000 -0400
+++ tk8.5.11/generic/ttk/ttkTreeview.c	2012-11-04 13:23:41.000000000 -0500
@@ -485,11 +485,11 @@
     }
 }
 
-/* + 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 @@
     } 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 @@
      */
     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);