aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--ext/socket/ancdata.c6
2 files changed, 8 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index e395cae039..e134899892 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Feb 23 02:54:31 2009 Tanaka Akira <akr@fsij.org>
+
+ * ext/socket/ancdata.c (ancillary_inspect): use SCM_TIMESTAMP instead
+ of SO_TIMESTAMP. SCM_TIMESTAMP != SO_TIMESTAMP on MacOS X.
+
Mon Feb 23 02:44:42 2009 Tanaka Akira <akr@fsij.org>
* ext/socket/ancdata.c (inspect_timeval_as_abstime): new function.
diff --git a/ext/socket/ancdata.c b/ext/socket/ancdata.c
index 93413c4cc5..99c32542f4 100644
--- a/ext/socket/ancdata.c
+++ b/ext/socket/ancdata.c
@@ -700,7 +700,7 @@ anc_inspect_ipv6_pktinfo(int level, int type, VALUE data, VALUE ret)
}
#endif
-#if defined(SO_TIMESTAMP)
+#if defined(SCM_TIMESTAMP)
static int
inspect_timeval_as_abstime(int level, int optname, VALUE data, VALUE ret)
{
@@ -790,8 +790,8 @@ ancillary_inspect(VALUE self)
# if defined(SOL_SOCKET)
case SOL_SOCKET:
switch (type) {
-# if defined(SO_TIMESTAMP) /* GNU/Linux, MacOS X, Solaris */
- case SO_TIMESTAMP: inspected = inspect_timeval_as_abstime(level, type, data, ret); break;
+# if defined(SCM_TIMESTAMP) /* GNU/Linux, MacOS X, Solaris */
+ case SCM_TIMESTAMP: inspected = inspect_timeval_as_abstime(level, type, data, ret); break;
# endif
# if defined(SCM_RIGHTS) /* 4.4BSD */
case SCM_RIGHTS: inspected = anc_inspect_socket_rights(level, type, data, ret); break;