yugui	2010-11-15 20:43:58 +0900 (Mon, 15 Nov 2010)

  New Revision: 29796

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

  Log:
    merges r29242 from trunk into ruby_1_9_2.
    --
    * ext/socket/rubysocket.h (__DARWIN_ALIGNBYTES): workaround of a
      bug in system header of darwin 9.  [ruby-core:32341]

  Modified files:
    branches/ruby_1_9_2/ChangeLog
    branches/ruby_1_9_2/ext/socket/extconf.rb
    branches/ruby_1_9_2/ext/socket/rubysocket.h
    branches/ruby_1_9_2/version.h

Index: ruby_1_9_2/ChangeLog
===================================================================
--- ruby_1_9_2/ChangeLog	(revision 29795)
+++ ruby_1_9_2/ChangeLog	(revision 29796)
@@ -1,3 +1,8 @@
+Mon Sep 13 19:56:50 2010  Nobuyoshi Nakada  <nobu@r...>
+
+	* ext/socket/rubysocket.h (__DARWIN_ALIGNBYTES): workaround of a
+	  bug in system header of darwin 9.  [ruby-core:32341]
+
 Mon Sep 13 10:12:09 2010  NARUSE, Yui  <naruse@r...>
 
 	* util.c (ruby_strtod): reject Float('0x0.').
Index: ruby_1_9_2/ext/socket/rubysocket.h
===================================================================
--- ruby_1_9_2/ext/socket/rubysocket.h	(revision 29795)
+++ ruby_1_9_2/ext/socket/rubysocket.h	(revision 29796)
@@ -138,6 +138,16 @@
 };
 #endif
 
+#if defined __APPLE__ && defined __MACH__
+/*
+ * CMSG_ macros are broken on 64bit darwin, because __DARWIN_ALIGN
+ * aligns up to __darwin_size_t which is 64bit, but CMSG_DATA is
+ * 32bit-aligned.
+ */
+#undef __DARWIN_ALIGNBYTES
+#define __DARWIN_ALIGNBYTES (sizeof(unsigned int) - 1)
+#endif
+
 #if defined(_AIX)
 #ifndef CMSG_SPACE
 # define CMSG_SPACE(len) (_CMSG_ALIGN(sizeof(struct cmsghdr)) + _CMSG_ALIGN(len))
Index: ruby_1_9_2/ext/socket/extconf.rb
===================================================================
--- ruby_1_9_2/ext/socket/extconf.rb	(revision 29795)
+++ ruby_1_9_2/ext/socket/extconf.rb	(revision 29796)
@@ -117,8 +117,7 @@
   }
 end
 
-if (have_func("sendmsg") | have_func("recvmsg")) && /64-darwin/ !~ RUBY_PLATFORM
-  # CMSG_ macros are broken on 64bit darwin, because of use of __DARWIN_ALIGN.
+if have_func("sendmsg") | have_func("recvmsg")
   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
Index: ruby_1_9_2/version.h
===================================================================
--- ruby_1_9_2/version.h	(revision 29795)
+++ ruby_1_9_2/version.h	(revision 29796)
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.2"
-#define RUBY_PATCHLEVEL 40
+#define RUBY_PATCHLEVEL 41
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1

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