diff options
author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-06-26 07:12:18 +0000 |
---|---|---|
committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-06-26 07:12:18 +0000 |
commit | c6d80075de97e10c72a37432763b863e70bbd187 (patch) | |
tree | 6831b783817fcc828040480b4886127151c3a1eb | |
parent | 9f170c5ceabaefcbb7b9cbc0802071ed6b1d2517 (diff) |
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]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@41643 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | ext/socket/extconf.rb | 6 | ||||
-rw-r--r-- | version.h | 2 |
3 files changed, 12 insertions, 1 deletions
@@ -1,3 +1,8 @@ +Wed Jun 26 16:10:01 2013 Eric Hodel <drbrain@segment7.net> + + * ext/socket/extconf.rb: Enable RFC 3542 IPV6 socket options for OS X + 10.7+. [ruby-trunk - Bug #8517] + Tue Jun 25 21:54:17 2013 NAKAMURA Usaku <usa@ruby-lang.org> * gc.c: Fixup around GC by MALLOC. diff --git a/ext/socket/extconf.rb b/ext/socket/extconf.rb index 380b3ecde0..5c29876a4b 100644 --- a/ext/socket/extconf.rb +++ b/ext/socket/extconf.rb @@ -24,6 +24,12 @@ else 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 @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.3" -#define RUBY_PATCHLEVEL 435 +#define RUBY_PATCHLEVEL 436 #define RUBY_RELEASE_DATE "2013-06-26" #define RUBY_RELEASE_YEAR 2013 |