From 6c5000b5f1a00bb1d21215aeb1881e8c66d4676d Mon Sep 17 00:00:00 2001 From: charliesome Date: Sat, 8 Jun 2013 10:33:05 +0000 Subject: [PATCH] * random.c (limited_big_rand): declare rnd, lim and mask as uint32_t to avoid 64 bit to 32 bit shorten warnings. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@41174 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ random.c | 7 ++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 67c0fd028f..27ce3288da 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sat Jun 8 19:31:00 2013 Charlie Somerville + + * random.c (limited_big_rand): declare rnd, lim and mask as uint32_t + to avoid 64 bit to 32 bit shorten warnings. + Sat Jun 8 19:23:53 2013 NARUSE, Yui * win32/Makefile.sub: r41163 changed win32/win32.c and configure.in diff --git a/random.c b/random.c index d41846b67e..6973ce389a 100644 --- a/random.c +++ b/random.c @@ -741,7 +741,7 @@ limited_big_rand(struct MT *mt, VALUE limit) { /* mt must be initialized */ - unsigned long mask, lim, rnd; + uint32_t mask; long i; int boundary; @@ -761,8 +761,9 @@ limited_big_rand(struct MT *mt, VALUE limit) mask = 0; boundary = 1; for (i = len-1; 0 <= i; i--) { - lim = lim_array[i]; - mask = mask ? 0xffffffff : make_mask(lim); + uint32_t rnd; + uint32_t lim = lim_array[i]; + mask = mask ? 0xffffffff : (uint32_t)make_mask(lim); if (mask) { rnd = genrand_int32(mt) & mask; if (boundary) {