* io.c (copy_stream_func): suppress warnings.
* thread_pthread.c (add_signal_thread_list): ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@16098 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
ae2921ae67
commit
d92efa3c0b
4
io.c
4
io.c
@ -6517,7 +6517,9 @@ static VALUE
|
|||||||
copy_stream_func(void *arg)
|
copy_stream_func(void *arg)
|
||||||
{
|
{
|
||||||
struct copy_stream_struct *stp = (struct copy_stream_struct *)arg;
|
struct copy_stream_struct *stp = (struct copy_stream_struct *)arg;
|
||||||
|
#ifdef USE_SENDFILE
|
||||||
int ret;
|
int ret;
|
||||||
|
#endif
|
||||||
|
|
||||||
#ifdef USE_SENDFILE
|
#ifdef USE_SENDFILE
|
||||||
ret = copy_stream_sendfile(stp);
|
ret = copy_stream_sendfile(stp);
|
||||||
@ -6527,7 +6529,9 @@ copy_stream_func(void *arg)
|
|||||||
|
|
||||||
copy_stream_read_write(stp);
|
copy_stream_read_write(stp);
|
||||||
|
|
||||||
|
#ifdef USE_SENDFILE
|
||||||
finish:
|
finish:
|
||||||
|
#endif
|
||||||
return Qnil;
|
return Qnil;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -115,7 +115,9 @@ native_cond_wait(pthread_cond_t *cond, pthread_mutex_t *mutex)
|
|||||||
#define native_cleanup_pop pthread_cleanup_pop
|
#define native_cleanup_pop pthread_cleanup_pop
|
||||||
#define native_thread_yield() sched_yield()
|
#define native_thread_yield() sched_yield()
|
||||||
|
|
||||||
|
#ifndef __CYGWIN__
|
||||||
static void add_signal_thread_list(rb_thread_t *th);
|
static void add_signal_thread_list(rb_thread_t *th);
|
||||||
|
#endif
|
||||||
static void remove_signal_thread_list(rb_thread_t *th);
|
static void remove_signal_thread_list(rb_thread_t *th);
|
||||||
|
|
||||||
static rb_thread_lock_t signal_thread_list_lock;
|
static rb_thread_lock_t signal_thread_list_lock;
|
||||||
@ -462,9 +464,11 @@ struct signal_thread_list {
|
|||||||
struct signal_thread_list *next;
|
struct signal_thread_list *next;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
#ifndef __CYGWIN__
|
||||||
static struct signal_thread_list signal_thread_list_anchor = {
|
static struct signal_thread_list signal_thread_list_anchor = {
|
||||||
0, 0, 0,
|
0, 0, 0,
|
||||||
};
|
};
|
||||||
|
#endif
|
||||||
|
|
||||||
#define FGLOCK(lock, body) do { \
|
#define FGLOCK(lock, body) do { \
|
||||||
native_mutex_lock(lock); \
|
native_mutex_lock(lock); \
|
||||||
@ -489,6 +493,7 @@ print_signal_list(char *str)
|
|||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifndef __CYGWIN__
|
||||||
static void
|
static void
|
||||||
add_signal_thread_list(rb_thread_t *th)
|
add_signal_thread_list(rb_thread_t *th)
|
||||||
{
|
{
|
||||||
@ -514,6 +519,7 @@ add_signal_thread_list(rb_thread_t *th)
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
static void
|
static void
|
||||||
remove_signal_thread_list(rb_thread_t *th)
|
remove_signal_thread_list(rb_thread_t *th)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user