mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* ext/socket/ancdata.c (ancillary_inspect): use SCM_TIMESTAMP instead
of SO_TIMESTAMP. SCM_TIMESTAMP != SO_TIMESTAMP on MacOS X. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@22561 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
475a350df8
commit
b7fe065741
2 changed files with 8 additions and 3 deletions
|
@ -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>
|
Mon Feb 23 02:44:42 2009 Tanaka Akira <akr@fsij.org>
|
||||||
|
|
||||||
* ext/socket/ancdata.c (inspect_timeval_as_abstime): new function.
|
* ext/socket/ancdata.c (inspect_timeval_as_abstime): new function.
|
||||||
|
|
|
@ -700,7 +700,7 @@ anc_inspect_ipv6_pktinfo(int level, int type, VALUE data, VALUE ret)
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined(SO_TIMESTAMP)
|
#if defined(SCM_TIMESTAMP)
|
||||||
static int
|
static int
|
||||||
inspect_timeval_as_abstime(int level, int optname, VALUE data, VALUE ret)
|
inspect_timeval_as_abstime(int level, int optname, VALUE data, VALUE ret)
|
||||||
{
|
{
|
||||||
|
@ -790,8 +790,8 @@ ancillary_inspect(VALUE self)
|
||||||
# if defined(SOL_SOCKET)
|
# if defined(SOL_SOCKET)
|
||||||
case SOL_SOCKET:
|
case SOL_SOCKET:
|
||||||
switch (type) {
|
switch (type) {
|
||||||
# if defined(SO_TIMESTAMP) /* GNU/Linux, MacOS X, Solaris */
|
# if defined(SCM_TIMESTAMP) /* GNU/Linux, MacOS X, Solaris */
|
||||||
case SO_TIMESTAMP: inspected = inspect_timeval_as_abstime(level, type, data, ret); break;
|
case SCM_TIMESTAMP: inspected = inspect_timeval_as_abstime(level, type, data, ret); break;
|
||||||
# endif
|
# endif
|
||||||
# if defined(SCM_RIGHTS) /* 4.4BSD */
|
# if defined(SCM_RIGHTS) /* 4.4BSD */
|
||||||
case SCM_RIGHTS: inspected = anc_inspect_socket_rights(level, type, data, ret); break;
|
case SCM_RIGHTS: inspected = anc_inspect_socket_rights(level, type, data, ret); break;
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue