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

* eval.c (rb_exec_recursive): matched the declaration to prototype.

Browse source 
* ext/curses/curses.c: don't need to check HAVE_WCOLOR_SET excluding
  window_color_set().

* ext/tk/tcltklib.c: fixed commit mistakes.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@8069 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
usa 2005-03-04 07:15:12 +00:00
parent 70bbad3cfd
commit 0992f6c472
4 changed files with 12 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

9
ChangeLog
View file

@ -1,3 +1,12 @@
Fri Mar 4 16:11:20 2005 NAKAMURA Usaku <usa@ruby-lang.org>
* eval.c (rb_exec_recursive): matched the declaration to prototype.
* ext/curses/curses.c: don't need to check HAVE_WCOLOR_SET excluding
window_color_set().
* ext/tk/tcltklib.c: fixed commit mistakes.
Fri Mar 4 12:45:17 2005 Yukihiro Matsumoto <matz@ruby-lang.org> Fri Mar 4 12:45:17 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
* array.c: replace rb_protect_inspect() and rb_inspecting_p() by * array.c: replace rb_protect_inspect() and rb_inspecting_p() by

2
eval.c
View file

@ -12992,7 +12992,7 @@ rb_throw(tag, val)
VALUE VALUE
rb_exec_recursive(func, obj, arg) rb_exec_recursive(func, obj, arg)
VALUE (*func) _((VALUE, VALUE, int)); VALUE (*func)(ANYARGS); /* VALUE obj, VALUE arg, int flag */
VALUE obj, arg; VALUE obj, arg;
{ {
VALUE list = rb_thread_local_aref(rb_thread_current(), recursive_key); VALUE list = rb_thread_local_aref(rb_thread_current(), recursive_key);

4
ext/curses/curses.c
View file

@ -561,7 +561,7 @@ curses_resizeterm(VALUE obj, VALUE lin, VALUE col)
#endif #endif
} }
#if defined(USE_COLOR) && defined(HAVE_WCOLOR_SET) #ifdef USE_COLOR
static VALUE static VALUE
curses_start_color(VALUE obj) curses_start_color(VALUE obj)
{ {
@ -1207,7 +1207,7 @@ window_color_set(VALUE obj, VALUE col)
return (res == OK) ? Qtrue : Qfalse; return (res == OK) ? Qtrue : Qfalse;
return Qfalse; return Qfalse;
} }
#endif /* USE_COLOR */ #endif /* defined(USE_COLOR) && defined(HAVE_WCOLOR_SET) */
static VALUE static VALUE
window_scroll(VALUE obj) window_scroll(VALUE obj)

24
ext/tk/tcltklib.c
View file

@ -4353,15 +4353,8 @@ delete_slaves(ip)
slave = Tcl_GetSlave(ip, slave_name); slave = Tcl_GetSlave(ip, slave_name);
if (slave == (Tcl_Interp*)NULL) continue; if (slave == (Tcl_Interp*)NULL) continue;
<<<<<<< tcltklib.c
if (Tcl_Eval(ip, "info slaves") == TCL_ERROR) {
DUMP2("ip(%lx) can't get a list of slave IPs", ip);
return;
}
=======
/* call ip_finalize */ /* call ip_finalize */
ip_finalize(slave); ip_finalize(slave);
>>>>>>> 1.3
Tcl_DeleteInterp(slave); Tcl_DeleteInterp(slave);
Tcl_Release(slave); Tcl_Release(slave);
@ -4493,12 +4486,6 @@ ip_replace_wait_commands(interp, mainWin)
(ClientData)mainWin, (Tcl_CmdDeleteProc *)NULL); (ClientData)mainWin, (Tcl_CmdDeleteProc *)NULL);
#endif #endif
<<<<<<< tcltklib.c
/* security check */
if (ruby_safe_level >= 4) {
rb_raise(rb_eSecurityError, "can't create a TclTkIp object at level %d", ruby_safe_level);
}
=======
/* replace 'tkwait' command */ /* replace 'tkwait' command */
#if TCL_MAJOR_VERSION >= 8 #if TCL_MAJOR_VERSION >= 8
DUMP1("Tcl_CreateObjCommand(\"tkwait\")"); DUMP1("Tcl_CreateObjCommand(\"tkwait\")");
@ -4676,7 +4663,6 @@ ip_init(argc, argv, self)
"Cannot create a TclTkIp object at level %d", "Cannot create a TclTkIp object at level %d",
ruby_safe_level); ruby_safe_level);
} }
>>>>>>> 1.3
/* create object */ /* create object */
Data_Get_Struct(self, struct tcltkip, ptr); Data_Get_Struct(self, struct tcltkip, ptr);
@ -4869,16 +4855,6 @@ ip_create_slave_core(interp, argc, argv)
thr_crit_bup = rb_thread_critical; thr_crit_bup = rb_thread_critical;
rb_thread_critical = Qtrue; rb_thread_critical = Qtrue;
<<<<<<< tcltklib.c
/* ip is deleted? */
if (Tcl_InterpDeleted(master->ip)) {
DUMP1("master-ip is deleted");
rb_thread_critical = thr_crit_bup;
rb_raise(rb_eRuntimeError, "deleted master can't create a new slave interpreter");
}
=======
>>>>>>> 1.3
/* create slave-ip */ /* create slave-ip */
slave->ref_count = 0; slave->ref_count = 0;
slave->allow_ruby_exit = 0; slave->allow_ruby_exit = 0;