merge revision(s) 44494:

	* lib/rinda/ring.rb (Rinda::RingFinger#make_socket):  Use
	  ipv4_multicast_ttl option for portability.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@45060 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 7 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index f97112c5fc..c861fb8939 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Feb 20 12:24:59 2014  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rinda/ring.rb (Rinda::RingFinger#make_socket):  Use
+	  ipv4_multicast_ttl option for portability.
+
 Thu Feb 20 10:19:40 2014  Tanaka Akira  <akr@fsij.org>
 
 	* ext/socket/option.c: IP_MULTICAST_LOOP and IP_MULTICAST_TTL socket
diff --git a/lib/rinda/ring.rb b/lib/rinda/ring.rb
index 4e9efadc35..2c29977d11 100644
--- a/lib/rinda/ring.rb
+++ b/lib/rinda/ring.rb
@@ -414,8 +414,7 @@ module Rinda
 
       if addrinfo.ipv4_multicast? then
         soc.setsockopt(Socket::Option.ipv4_multicast_loop(1))
-        soc.setsockopt(:IPPROTO_IP, :IP_MULTICAST_TTL,
-                       [@multicast_hops].pack('c'))
+        soc.setsockopt(Socket::Option.ipv4_multicast_ttl(@multicast_hops))
       elsif addrinfo.ipv6_multicast? then
         soc.setsockopt(:IPPROTO_IPV6, :IPV6_MULTICAST_LOOP, true)
         soc.setsockopt(:IPPROTO_IPV6, :IPV6_MULTICAST_HOPS,
diff --git a/version.h b/version.h
index ad83d4db76..2c6e0abeb2 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
 #define RUBY_VERSION "2.1.1"
 #define RUBY_RELEASE_DATE "2014-02-20"
-#define RUBY_PATCHLEVEL 36
+#define RUBY_PATCHLEVEL 37
 
 #define RUBY_RELEASE_YEAR 2014
 #define RUBY_RELEASE_MONTH 2