From 8ce4c226c4dd3f48e383dbf45ce9e83b4568696d Mon Sep 17 00:00:00 2001 From: "jan.nijtmans" Date: Tue, 13 Mar 2012 08:58:46 +0000 Subject: missing include --- xlib/xcolors.c | 1 + 1 file changed, 1 insertion(+) diff --git a/xlib/xcolors.c b/xlib/xcolors.c index 3a48faa..984797f 100644 --- a/xlib/xcolors.c +++ b/xlib/xcolors.c @@ -11,6 +11,7 @@ */ #include "tkInt.h" +#include /* * Forward declarations for functions used only in this file. -- cgit v0.12 From 15be8c0b27aaf02bfa0434ef4f8a34e7bd3f58a6 Mon Sep 17 00:00:00 2001 From: "jan.nijtmans" Date: Wed, 14 Mar 2012 23:08:19 +0000 Subject: workaround attempt for win64 problem????? --- xlib/xcolors.c | 1 + 1 file changed, 1 insertion(+) diff --git a/xlib/xcolors.c b/xlib/xcolors.c index 984797f..224d38e 100644 --- a/xlib/xcolors.c +++ b/xlib/xcolors.c @@ -855,6 +855,7 @@ FindColor( #ifdef __WIN32__ # ifdef NO_STRTOI64 /* This version only handles hex-strings without 0x prefix */ +#define _strtoi64 something_out_of_the_way /* workaround for win64 problem ??? */ static __int64 _strtoi64(const char *spec, char **p, int base) { -- cgit v0.12 From 54072496349622a788dad28bc5ab9c9df88084c0 Mon Sep 17 00:00:00 2001 From: "jan.nijtmans" Date: Thu, 15 Mar 2012 20:10:37 +0000 Subject: [bug 3505358 ] invalid color name "#f75df642f527" --- generic/tkColor.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/generic/tkColor.c b/generic/tkColor.c index fcc6581..edd8509 100644 --- a/generic/tkColor.c +++ b/generic/tkColor.c @@ -859,6 +859,8 @@ TkParseColor(display, map, spec, colorPtr) buf[2] = *(--spec); buf[1] = buf[4] = *(--spec); spec = buf; + } else { + spec -= 10; } } return XParseColor(display, map, spec, colorPtr); -- cgit v0.12