summaryrefslogtreecommitdiffstats
path: root/generic/tkColor.c
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2012-02-23 21:05:15 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2012-02-23 21:05:15 (GMT)
commit0f9601396ac38a4c71d0e9886ca3b7803dd2f2f0 (patch)
tree77856a3367dc55381fd807426cb81df2ed02efe7 /generic/tkColor.c
parent5b2786dd88c1bfa6339412aa3fb3e32754e527cf (diff)
parent9c889def7246e422c1eb98aa2e5e9e7e66298d44 (diff)
downloadtk-bug_1913750.zip
tk-bug_1913750.tar.gz
tk-bug_1913750.tar.bz2
- merge trunkbug_1913750
- provide _strtoi64 fallback for MSVC6.0
Diffstat (limited to 'generic/tkColor.c')
-rw-r--r--generic/tkColor.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/generic/tkColor.c b/generic/tkColor.c
index db649d3..3bf4857 100644
--- a/generic/tkColor.c
+++ b/generic/tkColor.c
@@ -832,7 +832,7 @@ Status
TkParseColor(
Display * display, /* The display */
Colormap map, /* Color map */
- _Xconst char* spec, /* String to be parsed */
+ const char* spec, /* String to be parsed */
XColor * colorPtr)
{
if (*spec == '#') {