diff options
author | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-09-04 12:00:24 +0000 |
---|---|---|
committer | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-09-04 12:00:24 +0000 |
commit | 80843ea156b7b2849b1fcc9764e85f70811cdd89 (patch) | |
tree | 2e4641fffcfc6c336d2326a2c0f0a6ac48ae7dfa /ext/tk/tkutil | |
parent | 0031967d2012896b7e86548a661cd0e1b3b52fa5 (diff) | |
download | ruby-80843ea156b7b2849b1fcc9764e85f70811cdd89.tar.gz |
* thread.c (rb_thread_check_trap_pending): added for compatibility.
* ext/tk/tcltklib.c, ext/tk/tkutil/tkutil.c: remove ruby/signal.h
dependency.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19128 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/tk/tkutil')
-rw-r--r-- | ext/tk/tkutil/tkutil.c | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/ext/tk/tkutil/tkutil.c b/ext/tk/tkutil/tkutil.c index 8155bff5ce..42c9330766 100644 --- a/ext/tk/tkutil/tkutil.c +++ b/ext/tk/tkutil/tkutil.c @@ -11,11 +11,6 @@ #include "ruby.h" -#ifdef HAVE_RUBY_SIGNAL_H -#include "ruby/signal.h" -#else -#include "rubysig.h" -#endif #ifdef HAVE_RUBY_ST_H #include "ruby/st.h" #else @@ -895,15 +890,12 @@ tk_conv_args(argc, argv, self) { int idx, size; volatile VALUE dst; - int thr_crit_bup; VALUE old_gc; if (argc < 2) { rb_raise(rb_eArgError, "too few arguments"); } - thr_crit_bup = rb_thread_critical; - rb_thread_critical = Qtrue; old_gc = rb_gc_disable(); for(size = 0, idx = 2; idx < argc; idx++) { @@ -928,7 +920,6 @@ tk_conv_args(argc, argv, self) } if (old_gc == Qfalse) rb_gc_enable(); - rb_thread_critical = thr_crit_bup; return rb_ary_plus(argv[0], dst); } @@ -1599,12 +1590,8 @@ cbsubst_scan_args(self, arg_key, val_ary) unsigned char type_chr; volatile VALUE dst = rb_ary_new2(vallen); volatile VALUE proc; - int thr_crit_bup; VALUE old_gc; - thr_crit_bup = rb_thread_critical; - rb_thread_critical = Qtrue; - old_gc = rb_gc_disable(); Data_Get_Struct(rb_const_get(self, ID_SUBST_INFO), @@ -1632,7 +1619,6 @@ cbsubst_scan_args(self, arg_key, val_ary) } if (old_gc == Qfalse) rb_gc_enable(); - rb_thread_critical = thr_crit_bup; return dst; } |