summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--generic/tkCanvUtil.c9
2 files changed, 10 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index f3c24d8..79c3f9d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-10-24 Donal K. Fellows <dkf@users.sf.net>
+
+ * generic/tkCanvUtil.c (TkSmoothPrintProc): Corrected 'const'ness to
+ quell warning. [Bug 2190619]
+
2008-10-23 Don Porter <dgp@users.sourceforge.net>
* README: Bump version number to 8.6a4
diff --git a/generic/tkCanvUtil.c b/generic/tkCanvUtil.c
index 5c14d48..6d84ad2 100644
--- a/generic/tkCanvUtil.c
+++ b/generic/tkCanvUtil.c
@@ -9,7 +9,7 @@
* See the file "license.terms" for information on usage and redistribution of
* this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tkCanvUtil.c,v 1.20 2008/04/27 22:38:55 dkf Exp $
+ * RCS: @(#) $Id: tkCanvUtil.c,v 1.21 2008/10/24 06:00:22 dkf Exp $
*/
#include "tkInt.h"
@@ -819,10 +819,10 @@ TkSmoothPrintProc(
* information about how to reclaim storage
* for return string. */
{
- register Tk_SmoothMethod **smoothPtr =
- (Tk_SmoothMethod **) (widgRec + offset);
+ register const Tk_SmoothMethod *smoothPtr =
+ * (Tk_SmoothMethod **) (widgRec + offset);
- return (*smoothPtr) ? (*smoothPtr)->name : "0";
+ return smoothPtr ? (char *) smoothPtr->name : "0";
}
/*
*--------------------------------------------------------------
@@ -1803,6 +1803,7 @@ TkCanvTranslatePath(
/*
* The current vertex is to the left of xClip
*/
+
if (!inside) {
/*
* If the current vertex is on the left of xClip and one