summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--ext/date/date_core.c4
-rw-r--r--ext/date/date_strftime.c2
3 files changed, 7 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 2891587..829296a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sun Aug 5 06:55:10 2012 Tadayoshi Funaba <tadf@dotrb.org>
+
+ * ext/date/date_{core,strftime}.c: [ruby-core:46990].
+
Sat Aug 4 22:56:20 2012 Narihiro Nakamura <authornari@gmail.com>
* 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 e44c647..762a0b7 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 87cb0a7..1307296 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;