diff options
| author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-02-23 11:21:45 +0000 |
|---|---|---|
| committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-02-23 11:21:45 +0000 |
| commit | a0e3e8e4d134bc1b94d5d43d613e13606c9a94d8 (patch) | |
| tree | 48de52217c6019e6ad05d0330743ef21530db48d /ext | |
| parent | 1a1990df715ebaa4fb54c69dc312b048aa56174f (diff) | |
* ext/socket/ancdata.c (inspect_timeval_as_abstime): use time_t
variable to avoid a warning on environments which use long as
tv_sec as NetBSD.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@22569 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/socket/ancdata.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/ext/socket/ancdata.c b/ext/socket/ancdata.c index 99c32542f4..793c7ed5df 100644 --- a/ext/socket/ancdata.c +++ b/ext/socket/ancdata.c @@ -705,13 +705,15 @@ static int inspect_timeval_as_abstime(int level, int optname, VALUE data, VALUE ret) { if (RSTRING_LEN(data) == sizeof(struct timeval)) { - struct timeval s; + struct timeval tv; + time_t time; struct tm tm; char buf[32]; - memcpy((char*)&s, RSTRING_PTR(data), sizeof(s)); - tm = *localtime(&s.tv_sec); + memcpy((char*)&tv, RSTRING_PTR(data), sizeof(tv)); + time = tv.tv_sec; + tm = *localtime(&time); strftime(buf, sizeof(buf), "%Y-%m-%d %H:%M:%S", &tm); - rb_str_catf(ret, " %s.%06ld", buf, (long)s.tv_usec); + rb_str_catf(ret, " %s.%06ld", buf, (long)tv.tv_usec); return 1; } else { @@ -790,7 +792,7 @@ ancillary_inspect(VALUE self) # if defined(SOL_SOCKET) case SOL_SOCKET: switch (type) { -# if defined(SCM_TIMESTAMP) /* GNU/Linux, MacOS X, Solaris */ +# if defined(SCM_TIMESTAMP) /* GNU/Linux, FreeBSD, NetBSD, OpenBSD, MacOS X, Solaris */ case SCM_TIMESTAMP: inspected = inspect_timeval_as_abstime(level, type, data, ret); break; # endif # if defined(SCM_RIGHTS) /* 4.4BSD */ |