akr	2010-08-19 19:54:56 +0900 (Thu, 19 Aug 2010)

  New Revision: 29053

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=29053

  Log:
    * ext/socket/ancdata.c (ancillary_timestamp): fix a constant type.
    
    * ext/socket/raddrinfo.c (get_afamily): suppress a warning.

  Modified files:
    trunk/ChangeLog
    trunk/ext/socket/ancdata.c
    trunk/ext/socket/raddrinfo.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 29052)
+++ ChangeLog	(revision 29053)
@@ -1,3 +1,9 @@
+Thu Aug 19 19:53:26 2010  Tanaka Akira  <akr@f...>
+
+	* ext/socket/ancdata.c (ancillary_timestamp): fix a constant type.
+
+	* ext/socket/raddrinfo.c (get_afamily): suppress a warning.
+
 Thu Aug 19 19:28:47 2010  Tanaka Akira  <akr@f...>
 
 	* thread_pthread.c (native_sleep): suppress a warning for platforms
Index: ext/socket/raddrinfo.c
===================================================================
--- ext/socket/raddrinfo.c	(revision 29052)
+++ ext/socket/raddrinfo.c	(revision 29053)
@@ -908,7 +908,7 @@
 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;
Index: ext/socket/ancdata.c
===================================================================
--- ext/socket/ancdata.c	(revision 29052)
+++ ext/socket/ancdata.c	(revision 29053)
@@ -333,7 +333,7 @@
         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);

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/