nagachika	2013-06-16 01:31:06 +0900 (Sun, 16 Jun 2013)

  New Revision: 41320

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

  Log:
    merge revision(s) 41266: [Backport #8517]
    
    * ext/socket/extconf.rb:  Enable RFC 3542 IPV6 socket options for OS X
      10.7+.  [ruby-trunk - Bug #8517]

  Modified directories:
    branches/ruby_2_0_0/
  Modified files:
    branches/ruby_2_0_0/ChangeLog
    branches/ruby_2_0_0/ext/socket/extconf.rb
    branches/ruby_2_0_0/version.h

Index: ruby_2_0_0/ChangeLog
===================================================================
--- ruby_2_0_0/ChangeLog	(revision 41319)
+++ ruby_2_0_0/ChangeLog	(revision 41320)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ChangeLog#L1
+Sun Jun 16 01:22:35 2013  Eric Hodel  <drbrain@s...>
+
+	* ext/socket/extconf.rb:  Enable RFC 3542 IPV6 socket options for OS X
+	  10.7+.  [ruby-trunk - Bug #8517]
+
 Sun Jun 16 01:11:10 2013  Koichi Sasada  <ko1@a...>
 
 	* compile.c (rb_iseq_compile_node): fix location of a `trace'
Index: ruby_2_0_0/ext/socket/extconf.rb
===================================================================
--- ruby_2_0_0/ext/socket/extconf.rb	(revision 41319)
+++ ruby_2_0_0/ext/socket/extconf.rb	(revision 41320)
@@ -23,6 +23,12 @@ else https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ext/socket/extconf.rb#L23
   have_library("socket", "socket")
 end
 
+if /darwin/ =~ RUBY_PLATFORM
+  # For IPv6 extension header access on OS X 10.7+ [Bug #8517]
+  $CFLAGS << " -D__APPLE_USE_RFC_3542"
+end
+
+headers = []
 unless $mswin or $bccwin or $mingw
   headers = %w<sys/types.h netdb.h string.h sys/socket.h netinet/in.h>
 end
Index: ruby_2_0_0/version.h
===================================================================
--- ruby_2_0_0/version.h	(revision 41319)
+++ ruby_2_0_0/version.h	(revision 41320)
@@ -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-06-16"
-#define RUBY_PATCHLEVEL 219
+#define RUBY_PATCHLEVEL 220
 
 #define RUBY_RELEASE_YEAR 2013
 #define RUBY_RELEASE_MONTH 6

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


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