diff options
author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-03-25 08:10:14 +0000 |
---|---|---|
committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-03-25 08:10:14 +0000 |
commit | 4e8fbe17787fe3d46431087f791ed443b1010e19 (patch) | |
tree | 23ae15e50f541be515f8c972c749fd25877d26c5 /ext/socket/option.c | |
parent | 526b12964f5ff09e671a2faf69bc6ca69db8bb54 (diff) | |
download | ruby-4e8fbe17787fe3d46431087f791ed443b1010e19.tar.gz |
* ext/socket/extconf.rb: Solaris 11 has struct tcp_info.tcpi_ca_state,
but it is a dummy.
* ext/socket/option.c: Solaris 11 doesn't have u_intN_t.
* ext/socket/option.c: Solaris 11 needs inspect_tcpi_msec.
* ext/socket/raddrinfo.c: Solaris 11 has AF_PACKET but doesn't have
related macros.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@50089 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/socket/option.c')
-rw-r--r-- | ext/socket/option.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/ext/socket/option.c b/ext/socket/option.c index 98f0ddc3b0..b00ffb910c 100644 --- a/ext/socket/option.c +++ b/ext/socket/option.c @@ -883,14 +883,14 @@ inspect_ipv6_mreq(int level, int optname, VALUE data, VALUE ret) #endif static void -inspect_tcpi_options(VALUE ret, u_int8_t options) +inspect_tcpi_options(VALUE ret, uint8_t options) { int sep = '='; rb_str_cat2(ret, " options"); #define INSPECT_TCPI_OPTION(optval, name) \ if (options & (optval)) { \ - options &= ~(u_int8_t)(optval); \ + options &= ~(uint8_t)(optval); \ rb_str_catf(ret, "%c%s", sep, name); \ sep = ','; \ } @@ -923,14 +923,14 @@ inspect_tcpi_options(VALUE ret, u_int8_t options) } static void -inspect_tcpi_usec(VALUE ret, const char *prefix, u_int32_t t) +inspect_tcpi_usec(VALUE ret, const char *prefix, uint32_t t) { rb_str_catf(ret, "%s%u.%06us", prefix, t / 1000000, t % 1000000); } -#ifdef __linux__ +#if defined(__linux__) || defined(__sun) static void -inspect_tcpi_msec(VALUE ret, const char *prefix, u_int32_t t) +inspect_tcpi_msec(VALUE ret, const char *prefix, uint32_t t) { rb_str_catf(ret, "%s%u.%03us", prefix, t / 1000, t % 1000); } |