summaryrefslogtreecommitdiffstats
path: root/ext
diff options
context:
space:
mode:
authorakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-02-22 17:55:52 +0000
committerakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-02-22 17:55:52 +0000
commitb7438298fde9b8ef2736a91b2304f69d3b7bbf0d (patch)
tree5b1ee70197de563ba0d587ea5ff80d7f7ed728a5 /ext
parentbda315567c23fb3c01d1ea2c73829529268cb4a4 (diff)
downloadruby-b7438298fde9b8ef2736a91b2304f69d3b7bbf0d.tar.gz
ruby-b7438298fde9b8ef2736a91b2304f69d3b7bbf0d.tar.xz
ruby-b7438298fde9b8ef2736a91b2304f69d3b7bbf0d.zip
* ext/socket/ancdata.c (ancillary_inspect): use SCM_TIMESTAMP instead
of SO_TIMESTAMP. SCM_TIMESTAMP != SO_TIMESTAMP on MacOS X. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@22561 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext')
-rw-r--r--ext/socket/ancdata.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/ext/socket/ancdata.c b/ext/socket/ancdata.c
index 93413c4cc..99c32542f 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;