akr	2013-02-15 07:08:28 +0900 (Fri, 15 Feb 2013)

  New Revision: 39246

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

  Log:
    * ext/socket/sockport.h (SA_LEN): removed because unused now.
      (SS_LEN): ditto.
      (SIN_LEN): ditto.

  Modified files:
    trunk/ChangeLog
    trunk/ext/socket/sockport.h

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 39245)
+++ ChangeLog	(revision 39246)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Fri Feb 15 07:07:27 2013  Tanaka Akira  <akr@f...>
+
+	* ext/socket/sockport.h (SA_LEN): removed because unused now.
+	  (SS_LEN): ditto.
+	  (SIN_LEN): ditto.
+
 Thu Feb 14 10:45:31 2013  KOSAKI Motohiro  <kosaki.motohiro@g...>
 
 	* test/ruby/test_process.rb (test_setsid): Added a workaround for
Index: ext/socket/sockport.h
===================================================================
--- ext/socket/sockport.h	(revision 39245)
+++ ext/socket/sockport.h	(revision 39246)
@@ -16,28 +16,6 @@ https://github.com/ruby/ruby/blob/trunk/ext/socket/sockport.h#L16
 # define VALIDATE_SOCKLEN(addr, len) ((void)(addr), (void)(len), 1)
 #endif
 
-#ifdef SA_LEN
-#  define SS_LEN(ss) (ss)->ss_len
-#else
-# ifdef HAVE_STRUCT_SOCKADDR_SA_LEN
-#  define SA_LEN(sa) (sa)->sa_len
-#  define SS_LEN(ss) (ss)->ss_len
-# else
-#  ifdef AF_INET6
-#   define SA_LEN(sa) \
-	(((sa)->sa_family == AF_INET6) ? sizeof(struct sockaddr_in6) \
-				       : sizeof(struct sockaddr))
-#   define SS_LEN(ss) \
-	(((ss)->ss_family == AF_INET6) ? sizeof(struct sockaddr_in6) \
-				       : sizeof(struct sockaddr))
-#  else
-    /* by tradition, sizeof(struct sockaddr) covers most of the sockaddrs */
-#   define SA_LEN(sa)	(sizeof(struct sockaddr))
-#   define SS_LEN(ss)	(sizeof(struct sockaddr))
-#  endif
-# endif
-#endif
-
 #ifdef HAVE_STRUCT_SOCKADDR_SA_LEN
 # define SET_SA_LEN(sa, len) (void)((sa)->sa_len = (len))
 # define SET_SS_LEN(ss, len) (void)((ss)->ss_len = (len))
@@ -47,10 +25,8 @@ https://github.com/ruby/ruby/blob/trunk/ext/socket/sockport.h#L25
 #endif
 
 #ifdef HAVE_STRUCT_SOCKADDR_IN_SIN_LEN
-# define SIN_LEN(si) (si)->sin_len
 # define SET_SIN_LEN(si,len) (si)->sin_len = (len)
 #else
-# define SIN_LEN(si) sizeof(struct sockaddr_in)
 # define SET_SIN_LEN(si,len)
 #endif
 

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