summaryrefslogtreecommitdiff
path: root/eval.c
diff options
context:
space:
mode:
authormatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2003-12-17 06:38:18 +0000
committermatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2003-12-17 06:38:18 +0000
commite78cb14774c3c08f1475299bb684b933ba2591b0 (patch)
treea4b269efa6e8341c107625d3ceb4344374cc8595 /eval.c
parent1c1d2b9c34f6adcaf25667ab51f7f3720b4d8abe (diff)
* lib/cgi.rb (CGI::QueryExtension::Value::[]): should work like
String#[] if more than one arguments are specified. * lib/delegate.rb: avoid using common instance name as "@obj". * lib/cgi.rb (CGI::QueryExtension::Value): Value is no longer subclass of String, but DelegateClass(String). * ext/curses/extconf.rb: restore function check for init_color. [ruby-list:38905] * Makefile.in: need to specify $(MAINLIBS) for the miniruby generation rule. * configure.in: better FreeBSD -lc_r support. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@5206 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'eval.c')
-rw-r--r--eval.c12
1 files changed, 5 insertions, 7 deletions
diff --git a/eval.c b/eval.c
index a793ae64b5..078d095ecf 100644
--- a/eval.c
+++ b/eval.c
@@ -9492,12 +9492,6 @@ static int thread_init = 0;
# define PTHREAD_TIMER
#endif
-#if defined(POSIX_SIGNAL)
-# define ruby_signal(x,y) posix_signal((x), (y))
-#else
-# define ruby_signal(x,y) signal((x), (y))
-#endif
-
#if defined(PTHREAD_TIMER) || defined(HAVE_SETITIMER)
static void
catch_timer(sig)
@@ -9589,7 +9583,11 @@ rb_thread_start_0(fn, arg, th)
if (!thread_init) {
thread_init = 1;
#if defined(HAVE_SETITIMER) || defined(PTHREAD_TIMER)
- ruby_signal(SIGVTALRM, catch_timer);
+#if defined(POSIX_SIGNAL)
+ posix_signal(SIGVTALRM, catch_timer);
+#else
+ signal(SIGVTALRM, catch_timer);
+#endif
#ifdef PTHREAD_TIMER
pthread_create(&time_thread, 0, thread_timer, 0);