summaryrefslogtreecommitdiff
path: root/ext/socket/option.c
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-01-19 13:04:53 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-01-19 13:04:53 +0000
commit5c179cd66c0290fbda67ffe74766702034016b2c (patch)
tree46695a8e6c13f3d7bcd73ff769ade4cf3c2904ce /ext/socket/option.c
parent41bdefd56f628781a19f5d5d5f6a9a05cb4f3e9e (diff)
socket/option.c: revert r44647
* ext/socket/option.c (NUM2SOCKOPT, sockopt_value): revert because these names are confusing. [ruby-dev:47903] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@44656 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/socket/option.c')
-rw-r--r--ext/socket/option.c34
1 files changed, 20 insertions, 14 deletions
diff --git a/ext/socket/option.c b/ext/socket/option.c
index dbed7d9..0b01065 100644
--- a/ext/socket/option.c
+++ b/ext/socket/option.c
@@ -2,16 +2,6 @@
VALUE rb_cSockOpt;
-#if defined(__NetBSD__) || defined(__OpenBSD__)
-typedef unsigned char rb_sockopt_t;
-# define NUM2SOCKOPT(value) NUM2CHR(rb_to_int(value))
-# define sockopt_value(obj) sockopt_byte(obj)
-# else
-typedef int rb_sockopt_t;
-# define NUM2SOCKOPT(value) NUM2INT(rb_to_int(value))
-# define sockopt_value(obj) sockopt_int(obj)
-#endif
-
static VALUE
constant_to_sym(int constant, ID (*intern_const)(int))
{
@@ -363,7 +353,11 @@ static VALUE
sockopt_s_ipv4_multicast_loop(VALUE klass, VALUE value)
{
#if defined(IPPROTO_IP) && defined(IP_MULTICAST_LOOP)
- rb_sockopt_t i = NUM2SOCKOPT(value);
+# if defined(__NetBSD__) || defined(__OpenBSD__)
+ unsigned char i = NUM2CHR(rb_to_int(value));
+# else
+ int i = NUM2INT(rb_to_int(value));
+# endif
return rsock_sockopt_new(AF_INET, IPPROTO_IP, IP_MULTICAST_LOOP,
rb_str_new((char*)&i, sizeof(i)));
#else
@@ -389,7 +383,11 @@ sockopt_ipv4_multicast_loop(VALUE self)
#if defined(IPPROTO_IP) && defined(IP_MULTICAST_LOOP)
if (family == AF_INET && level == IPPROTO_IP && optname == IP_MULTICAST_LOOP) {
- return sockopt_value(self);
+# if defined(__NetBSD__) || defined(__OpenBSD__)
+ return sockopt_byte(self);
+# else
+ return sockopt_int(self);
+# endif
}
#endif
rb_raise(rb_eTypeError, "ipv4_multicast_loop socket option expected");
@@ -418,7 +416,11 @@ static VALUE
sockopt_s_ipv4_multicast_ttl(VALUE klass, VALUE value)
{
#if defined(IPPROTO_IP) && defined(IP_MULTICAST_TTL)
- rb_sockopt_t i = NUM2SOCKOPT(value);
+# if defined(__NetBSD__) || defined(__OpenBSD__)
+ unsigned char i = NUM2CHR(rb_to_int(value));
+# else
+ int i = NUM2INT(rb_to_int(value));
+# endif
return rsock_sockopt_new(AF_INET, IPPROTO_IP, IP_MULTICAST_TTL,
rb_str_new((char*)&i, sizeof(i)));
#else
@@ -444,7 +446,11 @@ sockopt_ipv4_multicast_ttl(VALUE self)
#if defined(IPPROTO_IP) && defined(IP_MULTICAST_TTL)
if (family == AF_INET && level == IPPROTO_IP && optname == IP_MULTICAST_TTL) {
- return sockopt_value(self);
+# if defined(__NetBSD__) || defined(__OpenBSD__)
+ return sockopt_byte(self);
+# else
+ return sockopt_int(self);
+# endif
}
#endif
rb_raise(rb_eTypeError, "ipv4_multicast_ttl socket option expected");