diff options
| author | nagai <nagai@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-09-28 01:48:53 +0000 |
|---|---|---|
| committer | nagai <nagai@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-09-28 01:48:53 +0000 |
| commit | 64edb6d31d93aef7813680062b18d1ec6e46aa72 (patch) | |
| tree | 341bf9a829f752f5f145533a7e40dfbd0a5f878f /ext/tk | |
| parent | 462fd870d70a13713e13f78bb058ee0e06b0e31c (diff) | |
* ext/tk/tcltklib.c: cannot compile with Tcl/Tk8.0.x
[ruby-dev:27335].
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9326 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/tk')
| -rw-r--r-- | ext/tk/tcltklib.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/ext/tk/tcltklib.c b/ext/tk/tcltklib.c index 78792496d6..a6374cb0dc 100644 --- a/ext/tk/tcltklib.c +++ b/ext/tk/tcltklib.c @@ -4,7 +4,7 @@ * Oct. 24, 1997 Y. Matsumoto */ -#define TCLTKLIB_RELEASE_DATE "2005-08-09" +#define TCLTKLIB_RELEASE_DATE "2005-09-28" #include "ruby.h" #include "rubysig.h" @@ -171,11 +171,11 @@ Tcl_GetVar2Ex(interp, name1, name2, flags) { Tcl_Obj *nameObj1, *nameObj2 = NULL, *retObj; - nameObj1 = Tcl_NewStringObj(name1, -1); + nameObj1 = Tcl_NewStringObj((char*)name1, -1); Tcl_IncrRefCount(nameObj1); if (name2) { - nameObj2 = Tcl_NewStringObj(name2, -1); + nameObj2 = Tcl_NewStringObj((char*)name2, -1); Tcl_IncrRefCount(nameObj2); } @@ -197,14 +197,14 @@ Tcl_SetVar2Ex(interp, name1, name2, newValObj, flags) CONST char *name2; Tcl_Obj *newValObj; int flags; - +{ Tcl_Obj *nameObj1, *nameObj2 = NULL, *retObj; - nameObj1 = Tcl_NewStringObj(name1, -1); + nameObj1 = Tcl_NewStringObj((char*)name1, -1); Tcl_IncrRefCount(nameObj1); if (name2) { - nameObj2 = Tcl_NewStringObj(name2, -1); + nameObj2 = Tcl_NewStringObj((char*)name2, -1); Tcl_IncrRefCount(nameObj2); } @@ -5254,7 +5254,7 @@ get_obj_from_str(str) const char *s = StringValuePtr(str); #if TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION == 0 - return Tcl_NewStringObj(s, RSTRING(str)->len); + return Tcl_NewStringObj((char*)s, RSTRING(str)->len); #else /* TCL_VERSION >= 8.1 */ VALUE enc = rb_attr_get(str, ID_at_enc); |