diff options
| author | nagai <nagai@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-09-28 01:48:34 +0000 |
|---|---|---|
| committer | nagai <nagai@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-09-28 01:48:34 +0000 |
| commit | 6d385b2a29a7ff1924b456f568f261705fed9811 (patch) | |
| tree | 82c44c431520e4fe8685ac07b72b920c48a2f572 | |
| parent | a9280ca7c91c38b5135ca63ae0bbdb669e589f28 (diff) | |
* ext/tcltklib/tcltklib.c: cannot compile with Tcl/Tk8.0.x
[ruby-dev:27335].
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@9325 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ext/tcltklib/tcltklib.c | 14 |
2 files changed, 12 insertions, 7 deletions
@@ -1,3 +1,8 @@ +Wed Sep 28 10:45:44 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp> + + * ext/tcltklib/tcltklib.c: cannot compile with Tcl/Tk8.0.x + [ruby-dev:27335]. + Wed Sep 28 08:12:18 2005 Nobuyoshi Nakada <nobu@ruby-lang.org> * io.c (read_buffered_data): check if reached EOF. fixed: [ruby-dev:27334] diff --git a/ext/tcltklib/tcltklib.c b/ext/tcltklib/tcltklib.c index 78792496d6..a6374cb0dc 100644 --- a/ext/tcltklib/tcltklib.c +++ b/ext/tcltklib/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); |