diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-04-20 06:14:49 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-04-20 06:14:49 +0000 |
| commit | de2e0412719d51454f50515d191f8ca15a2f60ed (patch) | |
| tree | c7aa043c7f9339196fc855eb90122e98dead4578 | |
| parent | 7682b70a5cf39fbd136aa12daba00772ad42c50e (diff) | |
| download | ruby-de2e0412719d51454f50515d191f8ca15a2f60ed.tar.gz ruby-de2e0412719d51454f50515d191f8ca15a2f60ed.tar.xz ruby-de2e0412719d51454f50515d191f8ca15a2f60ed.zip | |
* io.c (copy_stream_func): suppress warnings.
* thread_pthread.c (add_signal_thread_list): ditto.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@16098 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | io.c | 4 | ||||
| -rw-r--r-- | thread_pthread.c | 6 |
2 files changed, 10 insertions, 0 deletions
@@ -6517,7 +6517,9 @@ static VALUE copy_stream_func(void *arg) { struct copy_stream_struct *stp = (struct copy_stream_struct *)arg; +#ifdef USE_SENDFILE int ret; +#endif #ifdef USE_SENDFILE ret = copy_stream_sendfile(stp); @@ -6527,7 +6529,9 @@ copy_stream_func(void *arg) copy_stream_read_write(stp); +#ifdef USE_SENDFILE finish: +#endif return Qnil; } diff --git a/thread_pthread.c b/thread_pthread.c index b26148bf4..30ffa8ca7 100644 --- a/thread_pthread.c +++ b/thread_pthread.c @@ -115,7 +115,9 @@ native_cond_wait(pthread_cond_t *cond, pthread_mutex_t *mutex) #define native_cleanup_pop pthread_cleanup_pop #define native_thread_yield() sched_yield() +#ifndef __CYGWIN__ static void add_signal_thread_list(rb_thread_t *th); +#endif static void remove_signal_thread_list(rb_thread_t *th); static rb_thread_lock_t signal_thread_list_lock; @@ -462,9 +464,11 @@ struct signal_thread_list { struct signal_thread_list *next; }; +#ifndef __CYGWIN__ static struct signal_thread_list signal_thread_list_anchor = { 0, 0, 0, }; +#endif #define FGLOCK(lock, body) do { \ native_mutex_lock(lock); \ @@ -489,6 +493,7 @@ print_signal_list(char *str) } #endif +#ifndef __CYGWIN__ static void add_signal_thread_list(rb_thread_t *th) { @@ -514,6 +519,7 @@ add_signal_thread_list(rb_thread_t *th) }); } } +#endif static void remove_signal_thread_list(rb_thread_t *th) |