akr	2009-02-23 20:21:45 +0900 (Mon, 23 Feb 2009)

  New Revision: 22569

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

  Log:
    * ext/socket/ancdata.c (inspect_timeval_as_abstime): use time_t
      variable to avoid a warning on environments which use long as
      tv_sec as NetBSD.

  Modified files:
    trunk/ChangeLog
    trunk/ext/socket/ancdata.c
    trunk/test/socket/test_socket.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 22568)
+++ ChangeLog	(revision 22569)
@@ -1,3 +1,9 @@
+Mon Feb 23 20:18:49 2009  Tanaka Akira  <akr@f...>
+
+	* ext/socket/ancdata.c (inspect_timeval_as_abstime): use time_t
+	  variable to avoid a warning on environments which use long as
+	  tv_sec as NetBSD.
+
 Mon Feb 23 15:53:30 2009  Akinori MUSHA  <knu@i...>
 
 	* array.c (rb_ary_index, rb_ary_rindex): We know that argc is not
Index: ext/socket/ancdata.c
===================================================================
--- ext/socket/ancdata.c	(revision 22568)
+++ ext/socket/ancdata.c	(revision 22569)
@@ -705,13 +705,15 @@
 inspect_timeval_as_abstime(int level, int optname, VALUE data, VALUE ret)
 {
     if (RSTRING_LEN(data) == sizeof(struct timeval)) {
-        struct timeval s;
+        struct timeval tv;
+        time_t time;
         struct tm tm;
         char buf[32];
-        memcpy((char*)&s, RSTRING_PTR(data), sizeof(s));
-        tm = *localtime(&s.tv_sec);
+        memcpy((char*)&tv, RSTRING_PTR(data), sizeof(tv));
+        time = tv.tv_sec;
+        tm = *localtime(&time);
         strftime(buf, sizeof(buf), "%Y-%m-%d %H:%M:%S", &tm);
-        rb_str_catf(ret, " %s.%06ld", buf, (long)s.tv_usec);
+        rb_str_catf(ret, " %s.%06ld", buf, (long)tv.tv_usec);
         return 1;
     }
     else {
@@ -790,7 +792,7 @@
 #        if defined(SOL_SOCKET)
           case SOL_SOCKET:
             switch (type) {
-#            if defined(SCM_TIMESTAMP) /* GNU/Linux, MacOS X, Solaris */
+#            if defined(SCM_TIMESTAMP) /* GNU/Linux, FreeBSD, NetBSD, OpenBSD, MacOS X, Solaris */
               case SCM_TIMESTAMP: inspected = inspect_timeval_as_abstime(level, type, data, ret); break;
 #            endif
 #            if defined(SCM_RIGHTS) /* 4.4BSD */
Index: test/socket/test_socket.rb
===================================================================
--- test/socket/test_socket.rb	(revision 22568)
+++ test/socket/test_socket.rb	(revision 22569)
@@ -274,12 +274,12 @@
   end
 
   def test_timestamp
-    return if /linux|solaris|darwin/ !~ RUBY_PLATFORM
+    return if /linux|freebsd|netbsd|openbsd|solaris|darwin/ !~ RUBY_PLATFORM
     t1 = Time.now.strftime("%Y-%m-%d")
     stamp = nil
     Addrinfo.udp("127.0.0.1", 0).bind {|s1|
       Addrinfo.udp("127.0.0.1", 0).bind {|s2|
-        s1.setsockopt(:SOCKET, :SO_TIMESTAMP, true)
+        s1.setsockopt(:SOCKET, :TIMESTAMP, true)
         s2.send "a", 0, s1.local_address
         msg, addr, rflags, stamp = s1.recvmsg
         assert_equal("a", msg)

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