2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 6b1fa6033f..d4490cbef0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Aug 23 22:22:07 2013  Tanaka Akira  <akr@fsij.org>
+
+	* process.c (rb_clock_gettime): Add a cast to fix compile error by
+	  -Werror,-Wshorten-64-to-32.
+
 Fri Aug 23 22:12:13 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* process.c (rb_intern): no symbol cache while initialization.
diff --git a/process.c b/process.c
index 818221f2ea..7e4b1441b0 100644
--- a/process.c
+++ b/process.c
@@ -6989,7 +6989,7 @@ rb_clock_gettime(int argc, VALUE *argv)
             if (ret != 0)
                 rb_sys_fail("getrusage");
             tt.giga_count = usage.ru_utime.tv_sec + usage.ru_stime.tv_sec;
-            usec = usage.ru_utime.tv_usec + usage.ru_stime.tv_usec;
+            usec = (int32_t)(usage.ru_utime.tv_usec + usage.ru_stime.tv_usec);
             if (1000000 <= usec) {
                 tt.giga_count++;
                 usec -= 1000000;