diff options
| author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-08-19 10:54:56 +0000 |
|---|---|---|
| committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-08-19 10:54:56 +0000 |
| commit | 85198c5e3cf702a333cf1acfbbbe8e925419e148 (patch) | |
| tree | 365ab08de9f40f27474084a57ceb0d0093520db8 /ext/socket | |
| parent | b73ea4b64ac0d7ad9666b4325d94f180849f97f3 (diff) | |
* ext/socket/ancdata.c (ancillary_timestamp): fix a constant type.
* ext/socket/raddrinfo.c (get_afamily): suppress a warning.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@29053 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/socket')
| -rw-r--r-- | ext/socket/ancdata.c | 2 | ||||
| -rw-r--r-- | ext/socket/raddrinfo.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ext/socket/ancdata.c b/ext/socket/ancdata.c index b58e03c712..045b68e9bc 100644 --- a/ext/socket/ancdata.c +++ b/ext/socket/ancdata.c @@ -333,7 +333,7 @@ ancillary_timestamp(VALUE self) struct bintime bt; VALUE d, timev; memcpy((char*)&bt, RSTRING_PTR(data), sizeof(bt)); - d = ULL2NUM(0x100000000UL); + d = ULL2NUM(0x100000000ULL); d = mul(d,d); timev = add(TIMET2NUM(bt.sec), quo(ULL2NUM(bt.frac), d)); result = rb_time_num_new(timev, Qnil); diff --git a/ext/socket/raddrinfo.c b/ext/socket/raddrinfo.c index c386bb9003..5638c9ec2b 100644 --- a/ext/socket/raddrinfo.c +++ b/ext/socket/raddrinfo.c @@ -908,7 +908,7 @@ addrinfo_initialize(int argc, VALUE *argv, VALUE self) static int get_afamily(struct sockaddr *addr, socklen_t len) { - if ((char*)&addr->sa_family + sizeof(addr->sa_family) - (char*)addr <= len) + if ((socklen_t)((char*)&addr->sa_family + sizeof(addr->sa_family) - (char*)addr) <= len) return addr->sa_family; else return AF_UNSPEC; |