From a9b42f1744a4879d046b237c04fd2b468e5d3200 Mon Sep 17 00:00:00 2001 From: nagachika Date: Thu, 24 Mar 2016 11:52:00 +0000 Subject: 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 --- ext/socket/option.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'ext') 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) { -- cgit v1.2.3