diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-02-23 21:05:15 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-02-23 21:05:15 (GMT) |
| commit | 0f9601396ac38a4c71d0e9886ca3b7803dd2f2f0 (patch) | |
| tree | 77856a3367dc55381fd807426cb81df2ed02efe7 /generic | |
| parent | 5b2786dd88c1bfa6339412aa3fb3e32754e527cf (diff) | |
| parent | 9c889def7246e422c1eb98aa2e5e9e7e66298d44 (diff) | |
| download | tk-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')
| -rw-r--r-- | generic/tkColor.c | 2 | ||||
| -rw-r--r-- | generic/tkConsole.c | 2 | ||||
| -rw-r--r-- | generic/tkInt.h | 2 |
3 files changed, 3 insertions, 3 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 == '#') { diff --git a/generic/tkConsole.c b/generic/tkConsole.c index a59092e..53f49c1 100644 --- a/generic/tkConsole.c +++ b/generic/tkConsole.c @@ -512,7 +512,7 @@ ConsoleOutput( * Assumption is utf-8 Tcl_Encoding is reliably present. */ - CONST char *bytes + const char *bytes = Tcl_ExternalToUtfDString(utf8, buf, toWrite, &ds); int numBytes = Tcl_DStringLength(&ds); Tcl_Obj *cmd = Tcl_NewStringObj("tk::ConsoleOutput", -1); diff --git a/generic/tkInt.h b/generic/tkInt.h index 4faf908..57157da 100644 --- a/generic/tkInt.h +++ b/generic/tkInt.h @@ -1215,7 +1215,7 @@ MODULE_SCOPE void TkpWarpPointer(TkDisplay *dispPtr); #define TkParseColor XParseColor #else MODULE_SCOPE Status TkParseColor (Display * display, - Colormap map, _Xconst char* spec, + Colormap map, const char* spec, XColor * colorPtr); #endif |