summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--ext/socket/option.c7
2 files changed, 12 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 2db4a27..b3159c2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 9fe21a1..7307548 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)
{