nagachika	2013-11-11 23:55:35 +0900 (Mon, 11 Nov 2013)

  New Revision: 43649

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

  Log:
    merge revision(s) 40136: [Backport #9084]
    
    * ext/socket/init.c (cloexec_accept): Fix a compile error on
      Debian GNU/kFreeBSD.  Consider HAVE_ACCEPT4 is defined
      but SOCK_CLOEXEC is not defined.

  Modified directories:
    branches/ruby_2_0_0/
  Modified files:
    branches/ruby_2_0_0/ChangeLog
    branches/ruby_2_0_0/ext/socket/init.c
    branches/ruby_2_0_0/version.h
Index: ruby_2_0_0/ChangeLog
===================================================================
--- ruby_2_0_0/ChangeLog	(revision 43648)
+++ ruby_2_0_0/ChangeLog	(revision 43649)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ChangeLog#L1
+Mon Nov 11 23:54:51 2013  Tanaka Akira  <akr@f...>
+
+	* ext/socket/init.c (cloexec_accept): Fix a compile error on
+	  Debian GNU/kFreeBSD.  Consider HAVE_ACCEPT4 is defined
+	  but SOCK_CLOEXEC is not defined.
+
 Mon Nov 11 22:14:37 2013  Nobuyoshi Nakada  <nobu@r...>
 
 	* include/ruby/win32.h (rb_infinity_float): suppress overflow in
Index: ruby_2_0_0/ext/socket/init.c
===================================================================
--- ruby_2_0_0/ext/socket/init.c	(revision 43648)
+++ ruby_2_0_0/ext/socket/init.c	(revision 43649)
@@ -488,7 +488,11 @@ cloexec_accept(int socket, struct sockad https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ext/socket/init.c#L488
     if (address_len) len0 = *address_len;
 #ifdef HAVE_ACCEPT4
     if (try_accept4) {
-        ret = accept4(socket, address, address_len, SOCK_CLOEXEC);
+        int flags = 0;
+#ifdef SOCK_CLOEXEC
+        flags |= SOCK_CLOEXEC;
+#endif
+        ret = accept4(socket, address, address_len, flags);
         /* accept4 is available since Linux 2.6.28, glibc 2.10. */
         if (ret != -1) {
             if (ret <= 2)
Index: ruby_2_0_0/version.h
===================================================================
--- ruby_2_0_0/version.h	(revision 43648)
+++ ruby_2_0_0/version.h	(revision 43649)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/version.h#L1
 #define RUBY_VERSION "2.0.0"
 #define RUBY_RELEASE_DATE "2013-11-11"
-#define RUBY_PATCHLEVEL 344
+#define RUBY_PATCHLEVEL 345
 
 #define RUBY_RELEASE_YEAR 2013
 #define RUBY_RELEASE_MONTH 11

Property changes on: ruby_2_0_0
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r40136


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