diff options
| author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-03-24 11:52:00 +0000 |
|---|---|---|
| committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-03-24 11:52:00 +0000 |
| commit | a9b42f1744a4879d046b237c04fd2b468e5d3200 (patch) | |
| tree | ac61a7c43943562bc33c03f1e74c2f84ceb48000 /ext | |
| parent | 3d3ff04b3e8b1456160ae25776c0bf96f955d20d (diff) | |
merge revision(s) 54139: [Backport #12185]
* ext/socket/option.c (inspect_tcpi_msec): more accurate condition
for TCPI msec member inspection function.
[ruby-core:74388] [Bug #12185]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@54247 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/socket/option.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/ext/socket/option.c b/ext/socket/option.c index 7eb21c73a4..c6f5717a44 100644 --- a/ext/socket/option.c +++ b/ext/socket/option.c @@ -933,7 +933,12 @@ inspect_tcpi_usec(VALUE ret, const char *prefix, uint32_t t) rb_str_catf(ret, "%s%u.%06us", prefix, t / 1000000, t % 1000000); } -#if defined(__linux__) || defined(__sun) +#if !defined __FreeBSD__ && ( \ + defined HAVE_STRUCT_TCP_INFO_TCPI_LAST_DATA_SENT || \ + defined HAVE_STRUCT_TCP_INFO_TCPI_LAST_DATA_RECV || \ + defined HAVE_STRUCT_TCP_INFO_TCPI_LAST_ACK_SENT || \ + defined HAVE_STRUCT_TCP_INFO_TCPI_LAST_ACK_RECV || \ + 0) static void inspect_tcpi_msec(VALUE ret, const char *prefix, uint32_t t) { |