nobu	2010-04-28 17:14:18 +0900 (Wed, 28 Apr 2010)

  New Revision: 27530

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

  Log:
    * ext/socket/extconf.rb: CMSG_ macros are broken on 64bit darwin,
      because of use of __DARWIN_ALIGN.

  Modified files:
    trunk/ChangeLog
    trunk/ext/socket/extconf.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 27529)
+++ ChangeLog	(revision 27530)
@@ -1,3 +1,8 @@
+Wed Apr 28 17:14:10 2010  Nobuyoshi Nakada  <nobu@r...>
+
+	* ext/socket/extconf.rb: CMSG_ macros are broken on 64bit darwin,
+	  because of use of __DARWIN_ALIGN.
+
 Wed Apr 28 16:44:58 2010  Nobuyoshi Nakada  <nobu@r...>
 
 	* include/ruby/ruby.h ({RSTRING,RSTRUCT,RBIGNUM}_LENINT): check long
Index: ext/socket/extconf.rb
===================================================================
--- ext/socket/extconf.rb	(revision 27529)
+++ ext/socket/extconf.rb	(revision 27530)
@@ -110,7 +110,8 @@
 have_header("netinet/tcp.h") if /cygwin/ !~ RUBY_PLATFORM # for cygwin 1.1.5
 have_header("netinet/udp.h")
 
-if have_func("sendmsg") | have_func("recvmsg")
+if (have_func("sendmsg") | have_func("recvmsg")) && /64-darwin/ !~ RUBY_PLATFORM
+  # CMSG_ macros are broken on 64bit darwin, because of use of __DARWIN_ALIGN.
   have_struct_member('struct msghdr', 'msg_control', ['sys/types.h', 'sys/socket.h'])
   have_struct_member('struct msghdr', 'msg_accrights', ['sys/types.h', 'sys/socket.h'])
 end

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