kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* ext/tk/tcltklib.c: cannot compile with Tcl/Tk8.0.x

Browse source 
[ruby-dev:27335].


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9326 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nagai 2005-09-28 01:48:53 +00:00
parent 462fd870d7
commit 64edb6d31d
2 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
Wed Sep 28 10:45:44 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
* ext/tk/tcltklib.c: cannot compile with Tcl/Tk8.0.x [ruby-dev:27335].
Wed Sep 28 07:56:52 2005 Nobuyoshi Nakada <nobu@ruby-lang.org> Wed Sep 28 07:56:52 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/yaml/basenode.rb (YAML::BaseNode::match_segment): fix typo. * lib/yaml/basenode.rb (YAML::BaseNode::match_segment): fix typo.

14
ext/tk/tcltklib.c
View file

@ -4,7 +4,7 @@
* Oct. 24, 1997 Y. Matsumoto * Oct. 24, 1997 Y. Matsumoto
*/ */
#define TCLTKLIB_RELEASE_DATE "2005-08-09" #define TCLTKLIB_RELEASE_DATE "2005-09-28"
#include "ruby.h" #include "ruby.h"
#include "rubysig.h" #include "rubysig.h"
@ -171,11 +171,11 @@ Tcl_GetVar2Ex(interp, name1, name2, flags)
{ {
Tcl_Obj *nameObj1, *nameObj2 = NULL, *retObj; Tcl_Obj *nameObj1, *nameObj2 = NULL, *retObj;
nameObj1 = Tcl_NewStringObj(name1, -1); nameObj1 = Tcl_NewStringObj((char*)name1, -1);
Tcl_IncrRefCount(nameObj1); Tcl_IncrRefCount(nameObj1);
if (name2) { if (name2) {
nameObj2 = Tcl_NewStringObj(name2, -1); nameObj2 = Tcl_NewStringObj((char*)name2, -1);
Tcl_IncrRefCount(nameObj2); Tcl_IncrRefCount(nameObj2);
} }
@ -197,14 +197,14 @@ Tcl_SetVar2Ex(interp, name1, name2, newValObj, flags)
CONST char *name2; CONST char *name2;
Tcl_Obj *newValObj; Tcl_Obj *newValObj;
int flags; int flags;
{
Tcl_Obj *nameObj1, *nameObj2 = NULL, *retObj; Tcl_Obj *nameObj1, *nameObj2 = NULL, *retObj;
nameObj1 = Tcl_NewStringObj(name1, -1); nameObj1 = Tcl_NewStringObj((char*)name1, -1);
Tcl_IncrRefCount(nameObj1); Tcl_IncrRefCount(nameObj1);
if (name2) { if (name2) {
nameObj2 = Tcl_NewStringObj(name2, -1); nameObj2 = Tcl_NewStringObj((char*)name2, -1);
Tcl_IncrRefCount(nameObj2); Tcl_IncrRefCount(nameObj2);
} }
@ -5254,7 +5254,7 @@ get_obj_from_str(str)
const char *s = StringValuePtr(str); const char *s = StringValuePtr(str);
#if TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION == 0 #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 */ #else /* TCL_VERSION >= 8.1 */
VALUE enc = rb_attr_get(str, ID_at_enc); VALUE enc = rb_attr_get(str, ID_at_enc);