aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-01-20 19:35:11 +0000
committerakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-01-20 19:35:11 +0000
commit8b5694d5e87e47e349ae30e0e10260f41cb236eb (patch)
tree0a64d02ce9811a1b11ba28d6114e873ed1879ead
parent779a630aee3aee42693abb6ae213234e799dcea0 (diff)
downloadruby-8b5694d5e87e47e349ae30e0e10260f41cb236eb.tar.gz
* ext/socket/option.c: Use "int" for IP_MULTICAST_LOOP and
IP_MULTICAST_TTL on Windows. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@44668 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--ext/socket/option.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 7d88382d93..7eaf6b2d11 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,7 @@
-Tue Jan 21 04:27:30 2014 Tanaka Akira <akr@fsij.org>
+Tue Jan 21 04:31:23 2014 Tanaka Akira <akr@fsij.org>
* ext/socket/option.c: Use "int" for IP_MULTICAST_LOOP and
- IP_MULTICAST_TTL on Mac OS X.
+ IP_MULTICAST_TTL on Mac OS X and Windows.
Tue Jan 21 00:39:15 2014 Tanaka Akira <akr@fsij.org>
diff --git a/ext/socket/option.c b/ext/socket/option.c
index 74bc15a106..2aa0768368 100644
--- a/ext/socket/option.c
+++ b/ext/socket/option.c
@@ -7,7 +7,7 @@ VALUE rb_cSockOpt;
#define CAT(x,y) x##y
#define XCAT(x,y) CAT(x,y)
-#if defined(__linux__) || defined(__FreeBSD__) || defined(__APPLE__)
+#if defined(__linux__) || defined(__FreeBSD__) || defined(__APPLE__) || defined(_WIN32)
# define TYPE_IP_MULTICAST_LOOP int
# define TYPE_IP_MULTICAST_TTL int
#else