diff options
| author | tadf <tadf@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-08-04 21:57:48 +0000 |
|---|---|---|
| committer | tadf <tadf@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-08-04 21:57:48 +0000 |
| commit | ab67ba64ca4729725ae57ed4eda232851674e645 (patch) | |
| tree | bbe0cb112d1019d1252a8fc2482db95fb945b370 | |
| parent | de0c788bb4d337d3bc2bb3f6fcac4b26cdccb8b8 (diff) | |
* ext/date/date_{core,strftime}.c: [ruby-core:46990].
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36620 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | ext/date/date_core.c | 4 | ||||
| -rw-r--r-- | ext/date/date_strftime.c | 2 |
3 files changed, 7 insertions, 3 deletions
@@ -1,3 +1,7 @@ +Sun Aug 5 06:55:10 2012 Tadayoshi Funaba <[email protected]> + + * ext/date/date_{core,strftime}.c: [ruby-core:46990]. + Sat Aug 4 22:56:20 2012 Narihiro Nakamura <[email protected]> * gc.c: use inline functions instead of macros, and close up diff --git a/ext/date/date_core.c b/ext/date/date_core.c index e44c6474c4..762a0b7472 100644 --- a/ext/date/date_core.c +++ b/ext/date/date_core.c @@ -7008,7 +7008,7 @@ date_strftime_internal(int argc, VALUE *argv, VALUE self, * * Seconds since the Unix Epoch: * %s - Number of seconds since 1970-01-01 00:00:00 UTC. - * %Q - Number of microseconds since 1970-01-01 00:00:00 UTC. + * %Q - Number of milliseconds since 1970-01-01 00:00:00 UTC. * * Literal string: * %n - Newline character (\n) @@ -8469,7 +8469,7 @@ dt_lite_to_s(VALUE self) * * Seconds since the Unix Epoch: * %s - Number of seconds since 1970-01-01 00:00:00 UTC. - * %Q - Number of microseconds since 1970-01-01 00:00:00 UTC. + * %Q - Number of milliseconds since 1970-01-01 00:00:00 UTC. * * Literal string: * %n - Newline character (\n) diff --git a/ext/date/date_strftime.c b/ext/date/date_strftime.c index 87cb0a7ddd..13072962a2 100644 --- a/ext/date/date_strftime.c +++ b/ext/date/date_strftime.c @@ -346,7 +346,7 @@ date_strftime_with_tmx(char *s, size_t maxsize, const char *format, i = 2; break; - case 'Q': /* microseconds since Unix epoch */ + case 'Q': /* milliseconds since Unix epoch */ FMTV('0', 1, "d", tmx_msecs); continue; |