kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* thread.c: fixed types.

Browse source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@23373 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2009-05-09 03:25:16 +00:00
parent f4be2ca564
commit 46be98a8cf
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
thread.c
View file

@ -391,7 +391,7 @@ thread_start_func_2(rb_thread_t *th, VALUE *stack_start, VALUE *register_stack_s
th->local_lfp = proc->block.lfp; th->local_lfp = proc->block.lfp;
th->local_svar = Qnil; th->local_svar = Qnil;
th->value = rb_vm_invoke_proc(th, proc, proc->block.self, th->value = rb_vm_invoke_proc(th, proc, proc->block.self,
RARRAY_LEN(args), RARRAY_PTR(args), 0); (int)RARRAY_LEN(args), RARRAY_PTR(args), 0);
} }
else { else {
th->value = (*th->first_func)((void *)th->first_args); th->value = (*th->first_func)((void *)th->first_args);
@ -750,7 +750,7 @@ double2timeval(double d)
time.tv_sec = (int)d; time.tv_sec = (int)d;
time.tv_usec = (int)((d - (int)d) * 1e6); time.tv_usec = (int)((d - (int)d) * 1e6);
if (time.tv_usec < 0) { if (time.tv_usec < 0) {
time.tv_usec += (long)1e6; time.tv_usec += (int)1e6;
time.tv_sec -= 1; time.tv_sec -= 1;
} }
return time; return time;
@ -2177,8 +2177,8 @@ rb_fd_zero(rb_fdset_t *fds)
static void static void
rb_fd_resize(int n, rb_fdset_t *fds) rb_fd_resize(int n, rb_fdset_t *fds)
{ {
int m = howmany(n + 1, NFDBITS) * sizeof(fd_mask); size_t m = howmany(n + 1, NFDBITS) * sizeof(fd_mask);
int o = howmany(fds->maxfd, NFDBITS) * sizeof(fd_mask); size_t o = howmany(fds->maxfd, NFDBITS) * sizeof(fd_mask);
if (m < sizeof(fd_set)) m = sizeof(fd_set); if (m < sizeof(fd_set)) m = sizeof(fd_set);
if (o < sizeof(fd_set)) o = sizeof(fd_set); if (o < sizeof(fd_set)) o = sizeof(fd_set);
@ -2214,7 +2214,7 @@ rb_fd_isset(int n, const rb_fdset_t *fds)
void void
rb_fd_copy(rb_fdset_t *dst, const fd_set *src, int max) rb_fd_copy(rb_fdset_t *dst, const fd_set *src, int max)
{ {
int size = howmany(max, NFDBITS) * sizeof(fd_mask); size_t size = howmany(max, NFDBITS) * sizeof(fd_mask);
if (size < sizeof(fd_set)) size = sizeof(fd_set); if (size < sizeof(fd_set)) size = sizeof(fd_set);
dst->maxfd = max; dst->maxfd = max;
@ -2414,7 +2414,7 @@ do_select(int n, fd_set *read, fd_set *write, fd_set *except,
double d = limit - timeofday(); double d = limit - timeofday();
wait_rest.tv_sec = (unsigned int)d; wait_rest.tv_sec = (unsigned int)d;
wait_rest.tv_usec = (long)((d-(double)wait_rest.tv_sec)*1e6); wait_rest.tv_usec = (int)((d-(double)wait_rest.tv_sec)*1e6);
if (wait_rest.tv_sec < 0) wait_rest.tv_sec = 0; if (wait_rest.tv_sec < 0) wait_rest.tv_sec = 0;
if (wait_rest.tv_usec < 0) wait_rest.tv_usec = 0; if (wait_rest.tv_usec < 0) wait_rest.tv_usec = 0;
} }