Skip to content

Commit

Permalink
* ext/socket/extconf.rb: don't test ss_family and ss_len member of
Browse files Browse the repository at this point in the history
  struct sockaddr_storage.  They are not used now except SunOS
  specific code.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39483 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
  • Loading branch information
akr committed Feb 25, 2013
1 parent c5a7cf0 commit 1580dd2
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 9 deletions.
6 changes: 6 additions & 0 deletions ChangeLog
@@ -1,3 +1,9 @@
Mon Feb 25 12:38:50 2013 Tanaka Akira <akr@fsij.org>

* ext/socket/extconf.rb: don't test ss_family and ss_len member of
struct sockaddr_storage. They are not used now except SunOS
specific code.

Mon Feb 25 11:03:38 2013 Akinori MUSHA <knu@iDaemons.org>

* configure.in (unexpand_shvar): Use the numeric comparison
Expand Down
9 changes: 0 additions & 9 deletions ext/socket/extconf.rb
Expand Up @@ -80,15 +80,6 @@
have_type("struct ip_mreqn", headers) # Linux 2.4
have_type("struct ipv6_mreq", headers) # RFC 3493

# doug's fix, NOW add -Dss_family... only if required!
doug = proc {have_struct_member("struct sockaddr_storage", "ss_family", headers)}
if (doug[] or
with_cppflags($CPPFLAGS + " -Dss_family=__ss_family", &doug))
$defs[-1] = "-DHAVE_SOCKADDR_STORAGE" # change from -DHAVE_ST_SS_FAMILY.
doug = proc {have_struct_member("struct sockaddr_storage", "ss_len", headers)}
doug[] or with_cppflags($CPPFLAGS + " -Dss_len=__ss_len", &doug)
end

have_struct_member('struct msghdr', 'msg_control', headers) unless $mswin or $mingw
have_struct_member('struct msghdr', 'msg_accrights', headers)

Expand Down

0 comments on commit 1580dd2

Please sign in to comment.