summaryrefslogtreecommitdiff
path: root/eval.c
diff options
context:
space:
mode:
Diffstat (limited to 'eval.c')
-rw-r--r--eval.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/eval.c b/eval.c
index c1e4c983ab..886914c428 100644
--- a/eval.c
+++ b/eval.c
@@ -6035,7 +6035,7 @@ rb_call_super(argc, argv)
int argc;
const VALUE *argv;
{
- VALUE result, self, klass, k;
+ VALUE result, self, klass;
if (ruby_frame->last_class == 0) {
rb_name_error(ruby_frame->last_func, "calling `super' from `%s' is prohibited",
@@ -10648,7 +10648,9 @@ rb_thread_select(max, read, write, except, timeout)
fd_set *read, *write, *except;
struct timeval *timeout;
{
+#ifndef linux
double limit;
+#endif
int n;
if (!read && !write && !except) {
@@ -10660,10 +10662,12 @@ rb_thread_select(max, read, write, except, timeout)
return 0;
}
+#ifndef linux
if (timeout) {
limit = timeofday()+
(double)timeout->tv_sec+(double)timeout->tv_usec*1e-6;
}
+#endif
if (rb_thread_critical ||
curr_thread == curr_thread->next ||
@@ -11509,7 +11513,7 @@ rb_thread_start_0(fn, arg, th)
{
volatile rb_thread_t th_save = th;
volatile VALUE thread = th->thread;
- struct BLOCK *volatile saved_block = 0, *block;
+ struct BLOCK *volatile saved_block = 0;
enum thread_status status;
int state;
@@ -12353,7 +12357,6 @@ rb_callcc(self)
volatile rb_thread_t th_save;
struct tag *tag;
struct RVarmap *vars;
- struct BLOCK *blk;
THREAD_ALLOC(th);
cont = Data_Wrap_Struct(rb_cCont, thread_mark, thread_free, th);