diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-03-17 02:36:28 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-03-17 02:36:28 +0000 |
| commit | 551f6b3a18bd0a298773407246a25750c926f863 (patch) | |
| tree | 585713985991e8ebe2f4f7cb07e35c875a210a3e | |
| parent | d90af78f05df7cc1442aa205044d69baac6fc720 (diff) | |
socket/option.c: accurate condition
* 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/trunk@54139 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | ext/socket/option.c | 7 |
2 files changed, 12 insertions, 1 deletions
@@ -1,3 +1,9 @@ +Thu Mar 17 11:36:27 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * ext/socket/option.c (inspect_tcpi_msec): more accurate condition + for TCPI msec member inspection function. + [ruby-core:74388] [Bug #12185] + Thu Mar 17 08:13:43 2016 Rei Odaira <Rei.Odaira@gmail.com> * test/-ext-/time/test_new.rb (test_timespec_new): Time#gmtoff values diff --git a/ext/socket/option.c b/ext/socket/option.c index 9fe21a12c1..7307548e50 100644 --- a/ext/socket/option.c +++ b/ext/socket/option.c @@ -930,7 +930,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) { |